12 Commits (android-fixes)