Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev