Merge branch 'android-proposals'