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

Change-Id: I3e745599be0f81decfe416a71503dc784a895a48