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

Change-Id: I0125d756d2026656afca9e29b7963c0e724750ac