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

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