android-4.2.1_r1.2

Change-Id: Ibe2de7da0df3c4c1f966dd044b85029eaa7d6e27