Android 4.2 CTS release 2
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ibef4c059b7a7e055fe562c60656a9f7f7de4841a