Merge "Fix Automated API Review: InetAddresses"