am a396af51: am 4bdf0c11: Merge "Do not initialize SSLSocketFactory too early"

* commit 'a396af51a908946a58d2b324cfe4a832cfff01cf':
  Do not initialize SSLSocketFactory too early