Merge "Fix SocketFactoryTest#test_createSocket_InetAddressIInetAddressI"