Merge "Fix API for SocketUtils"