Merge "Fix broken tests for Xml."