am 4c23360a: am 5f3ee644: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com"

* commit '4c23360ada30cde9e22a9cf4aded2ca403e6bc39':
  Change SSLCertificateSocketFactoryTest to use googlemail.com