Merge "Do not use hidden API XmlUtils." am: 2626cc7089 am: 6f083ff661

Change-Id: I58879292c13eaefd4dd32eecb4599560337155a7