Merge "Fix SocketUtils API" am: 3da7809ae4 am: f0ef74dc7a
am: 4adf7d6a17

Change-Id: Ib2de3e87ab61a2ff4918e9dfc3ae2b012e24b5c2