Merge "Merge commit 'android-4.2.1_r1' into Upgrade_branch"