Merge remote-tracking branch 'origin/android-5.0.1.1' into android-5.0.1.1