Merge "Add some utilities to IPSockAddr"
am: 1fb0730120

Change-Id: I3c61957a70ea33ed44c733e21765f00a30672604