Merge branch 'android-fixes'