Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress"