am acac58ba: Merge "Remove workaround for *.clients.google.com hostname verication."

* commit 'acac58bae79a73219f23f48d59fc2971fc81f3b1':
  Remove workaround for *.clients.google.com hostname verication.