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

Automated import of CL 145615
6 files changed