Merge "Remove SocketUtils#setSocketTimeValueOption"