Merge "Use XmlUtils from internal.util instead of the telephony copy"