Merge "Rename TestQuotasClient to TestHostsClient"