am c797fd61: am c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."

* commit 'c797fd614d28a0c5c3aacbff325e9de572d7f091':
  Fix broken XML parsing idiom.