Merge "Fix Automated API Review: InetAddresses" am: 4daca39083
am: 670be0f20f

Change-Id: Ibcef646f539b1a871d8521d7216ecb6f7df8c0fd