Merge "SSLSocketFactory: avoid creating a new default"