am 954f78a8: Merge "Delay SSLSocketImpl instantiation until needed DO NOT MERGE" into jb-mr2-dev

* commit '954f78a851c6f1ca71c13e5c98ce1aa97c43449c':
  Delay SSLSocketImpl instantiation until needed DO NOT MERGE