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

Automated import of CL 144820
8 files changed