am d17b69ec: Clean up XmlParserUtils

* commit 'd17b69ec000adc02f057fa69055411fd5438885f':
  Clean up XmlParserUtils