Merge "Fix SocketUtils API"
am: 3da7809ae4

Change-Id: I03e0eb60d71cba27e57f8ee7832269bbd75f5344