Merge commit 'android-4.2.1_r1.2' into cm-10.1

Change-Id: Icc6a9366b3d6b184328ecbebca2c6c54f71af53f