Multiple commit - huge update and imports from to L-Droid