am 64bb1b75: am 799044f3: am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev

* commit '64bb1b75488afc169e1f50db2228b563889fc000':
  Change SSLCertificateSocketFactoryTest to use googlemail.com