Latest Android changes, finished