am 423fd460: (-s ours) am 8e194d42: am f602b9df: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '423fd4600ed6c5d2a9cef543f1a6daf5f57ff4b3':
  Delay SSLSocketImpl instantiation until needed DO NOT MERGE