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

* commit '198f049a13c6540076c070e8bb388cba95660343':
  Change SSLCertificateSocketFactoryTest to use googlemail.com