Merge "Fix SocketUtils API"