Merge "Updating for xml-apis dependency"