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

* commit '01e4ec6d3ae86aff2dd0d7089beddfb85c8efff3':
  Change SSLCertificateSocketFactoryTest to use googlemail.com