am 3a869dfa: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com"

* commit '3a869dfa1058fe5c8dda8e0c28ab7495b24f23eb':
  Change SSLCertificateSocketFactoryTest to use googlemail.com