Merge "Remove SocketUtils from incompatibilities"