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