Merge "Change g.*Converter to fromXml."