Merge "Remove dependence on internal XmlUtils from CTS tests" into mnc-dev