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

* commit '4bdf0c11f7c6ec7e6310a579b40e7efd03baa94d':
  Do not initialize SSLSocketFactory too early