Merge android-4.2.1_r1.2