Merge "Fix InetAddressCompat exception handling" into sc-dev