Merge "Add SocketUtils for NetworkStack"
am: cdf945043d

Change-Id: I0db40afbf2de55d77d9d5493e556f499d2383f59