Merge "Use SocketUtils from shared lib"