Merge "Update service client access test_dns_integration"