Merge "Remove hidden API dependency of XmlUtils"