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

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