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

* commit '505ce805c31d697dd12bb2c033eb69b3d7ec9696':
  Change SSLCertificateSocketFactoryTest to use googlemail.com