Android 4.2 CTS release 2
am 52e40b6d: am 446c6e7c: (-s ours) am a0d32add: DO NOT MERGE

* commit '52e40b6d1208f120229d4aff28de80de0842a0d9':
  DO NOT MERGE