Merge "release-request-6ccab32c-8a06-4337-8cfa-d03fdfedb04e-for-aosp-nougat-mr1-cts-release-4338825 snap-temp-L84500000103155287" into nougat-mr1-cts-release
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java
index 4998dc5..198e725 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java
@@ -713,7 +713,7 @@
         // now create one that is not connected and validate that we get the
         // right answer
         DatagramSocket theSocket = new DatagramSocket(null);
-        theSocket.bind(new InetSocketAddress(InetAddress.getLocalHost(), 0));
+        theSocket.bind(new InetSocketAddress(Inet6Address.LOOPBACK, 0));
         assertNull(theSocket.getRemoteSocketAddress());
 
         // now connect and validate we get the right answer