Merge remote-tracking branch 'origin/android-faster'