Merge "Deprecate SSLCertificateSocketFactory" am: f86156158c am: 6804819923
am: 37db9722a6

Change-Id: I8e716337b30fa802a5b07f8f16421ad3a499720e