Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress am: 7e5fed0098"