AI 144825: am: CL 144820 am: CL 144816 Bringing XNET down to zero broken tests.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144825
8 files changed