AI 144816: Bringing XNET down to zero broken tests.
  BUG=1285921

Automated import of CL 144816
8 files changed