Android 4.2 CTS release 2
Merge branch 'upstream'