From 1ef5f7279a0e7945e3998eaf5f27af2baf7e3e27 Mon Sep 17 00:00:00 2001
From: "TF.Text Team" <tf-text-github-robot@google.com>
Date: Mon, 18 Aug 2025 09:13:35 -0700
Subject: [PATCH] No public description

PiperOrigin-RevId: 796452056
---
 tensorflow_text/core/kernels/BUILD                          | 1 +
 tensorflow_text/core/kernels/sentencepiece_kernels.cc       | 3 ++-
 tensorflow_text/core/kernels/split_merge_tokenize_kernel.cc | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tensorflow_text/core/kernels/BUILD b/tensorflow_text/core/kernels/BUILD
index 3206db5bc..8e6fc14d2 100644
--- a/tensorflow_text/core/kernels/BUILD
+++ b/tensorflow_text/core/kernels/BUILD
@@ -1018,6 +1018,7 @@ tf_cc_library(
     ],
     deps = [
         "@com_google_absl//absl/base:core_headers",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
         "@icu//:common",
     ],
diff --git a/tensorflow_text/core/kernels/sentencepiece_kernels.cc b/tensorflow_text/core/kernels/sentencepiece_kernels.cc
index fb0e9a02c..4cc91495b 100644
--- a/tensorflow_text/core/kernels/sentencepiece_kernels.cc
+++ b/tensorflow_text/core/kernels/sentencepiece_kernels.cc
@@ -17,6 +17,7 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/meta/type_traits.h"
+#include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/types/span.h"
@@ -95,7 +96,7 @@ constexpr int64 kCostPerUnit = 10000;
 
 ::tensorflow::Status ToTFStatus(const sentencepiece::util::Status& s) {
   if (s.ok()) return ::tensorflow::Status();
-  return ::tensorflow::Status(static_cast<::tensorflow::errors::Code>(s.code()),
+  return ::tensorflow::Status(static_cast<::absl::StatusCode>(s.code()),
                               ::tensorflow::string(s.message()));
 }
 
diff --git a/tensorflow_text/core/kernels/split_merge_tokenize_kernel.cc b/tensorflow_text/core/kernels/split_merge_tokenize_kernel.cc
index 664316ddf..6a5372dd0 100644
--- a/tensorflow_text/core/kernels/split_merge_tokenize_kernel.cc
+++ b/tensorflow_text/core/kernels/split_merge_tokenize_kernel.cc
@@ -17,6 +17,7 @@
 #include <string>
 #include <vector>
 
+#include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "icu4c/source/common/unicode/uchar.h"
 #include "icu4c/source/common/unicode/umachine.h"
@@ -72,13 +73,13 @@ Status TokenizeByLabel(const absl::string_view& text,
                        std::vector<int>* end_offset, int* num_tokens) {
   std::vector<absl::string_view> chars;
   if (!GetUTF8Chars(text, &chars)) {
-    return Status(static_cast<tensorflow::errors::Code>(
+    return Status(static_cast<::absl::StatusCode>(
                       absl::StatusCode::kInvalidArgument),
                   absl::StrCat("Input string is not utf8 valid: ", text));
   }
 
   if (chars.size() > labels_tensor.dim_size(0)) {
-    return Status(static_cast<tensorflow::errors::Code>(
+    return Status(static_cast<::absl::StatusCode>(
                       absl::StatusCode::kInvalidArgument),
                   absl::StrCat("Number of labels ", labels_tensor.dim_size(0),
                                " is insufficient for text ", text));