Merge "Fix InetAddressCompat exception handling"