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

* commit 'd0495a354fdcf28c69853ec7ae02a6799a44dcbb':