Merge "Add InetAddresses class to API" am: 92871b78fa am: b072c4439e
am: 5ee229c96f

Change-Id: I6149da91b9bc2403f1764cfcc4a4f92758c13b26