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

* commit '107eb74074981904c29e005a24dc707b13db457e':
  Fix broken XML parsing idiom.