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

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