Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com"