diff --git a/mediapipe/calculators/tensor/BUILD b/mediapipe/calculators/tensor/BUILD
index 4c6e91759..654b71351 100644
--- a/mediapipe/calculators/tensor/BUILD
+++ b/mediapipe/calculators/tensor/BUILD
@@ -289,6 +289,23 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "universal_sentence_encoder_preprocessor_calculator",
+    srcs = ["universal_sentence_encoder_preprocessor_calculator.cc"],
+    deps = [
+        "//mediapipe/framework:calculator_context",
+        "//mediapipe/framework:calculator_framework",
+        "//mediapipe/framework/api2:node",
+        "//mediapipe/framework/api2:port",
+        "//mediapipe/framework/formats:tensor",
+        "//mediapipe/tasks/cc/core:utils",
+        "//mediapipe/tasks/cc/metadata:metadata_extractor",
+        "@com_google_absl//absl/container:flat_hash_set",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings",
+    ],
+)
+
 mediapipe_proto_library(
     name = "inference_calculator_proto",
     srcs = ["inference_calculator.proto"],
diff --git a/mediapipe/calculators/tensor/universal_sentence_encoder_preprocessor_calculator_test.cc b/mediapipe/calculators/tensor/universal_sentence_encoder_preprocessor_calculator_test.cc
index d5f252b57..0f4744c90 100644
--- a/mediapipe/calculators/tensor/universal_sentence_encoder_preprocessor_calculator_test.cc
+++ b/mediapipe/calculators/tensor/universal_sentence_encoder_preprocessor_calculator_test.cc
@@ -88,9 +88,7 @@ RunUniversalSentenceEncoderPreprocessorCalculator(absl::string_view text) {
         kNumInputTensorsForUniversalSentenceEncoder));
   }
   if (tensor_vec[0].element_type() != Tensor::ElementType::kChar) {
-    return absl::InvalidArgumentError(absl::Substitute(
-        "tensor has element type $0, expected $1", tensor_vec[0].element_type(),
-        Tensor::ElementType::kChar));
+    return absl::InvalidArgumentError("Expected tensor element type kChar");
   }
   std::vector<std::string> results;
   for (int i = 0; i < kNumInputTensorsForUniversalSentenceEncoder; ++i) {