Merge tag android-4.2.2_r1.2