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

Change-Id: I64bdfecce06575251ca5d6b02ba998b49917c283