AI 145291: Fixes from the review of 'Bringing XNET down to zero broken tests.'
  BUG=1285921

Automated import of CL 145291
6 files changed