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

Change-Id: If460832503e71fccf41494e99ea78d1b85a50ef6