Merge "Enable HostsAdminTestXML"