revision="refs/tags/android-4.2.1_r1.2" - fixes