Merge "Reinstate the workaround for android.clients.google.com."