Merge "Add InetAddresses class to API"