am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils

* commit '56b1bd866a97b4662401ff98c287c56f4f26432a':