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

* commit 'd15dd73c1d2e887d53d530c5188539d9a9759a8b':
  Change SSLCertificateSocketFactoryTest to use googlemail.com