Merge "Fix for test_SSLSocket_HandshakeCompletedListener_RuntimeException"