Merge "Avoid a spurious NullPointerException in java.net.Inet6AddressImpl#icmpEcho" into pi-dev