Android 4.2 CTS release 2
am 77b9074f: Backport from master.

* commit '77b9074f3d835682d66fe18e0768639745c34239':
  Backport from master.