AI 146133: am: CL 146132 Fixes from the review of 'Bringing XML down to one broken test.'
  Original author: ursg
  Merged from: //branches/cupcake/...

Automated import of CL 146133
2 files changed