Merge "Fix DatagramSocketTest#test_getRemoteSocketAddress" am: 9384e8ff4b
am: 8af7f812ec

Change-Id: I28dfa4a4c424fc3f23b63d249003a244002900a8