AI 145652: am: CL 145615 am: CL 145291 Fixes from the review of 'Bringing XNET down to zero broken tests.'
  Original author: ursg
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145652
6 files changed