diff --git a/WORKSPACE b/WORKSPACE
index 9eab1706d91..73a73f2e04c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -26,6 +26,7 @@ tensorflow_http_archive(
     name = "org_tensorflow",
     sha256 = "e7b21fb5b68dc01cd82eadb8484ddfb54a0a291bdcd5fa153c58f01eca52baa7",
     git_commit = "5b2454e3de818c7ac24cf7fbb8d82aed83a577ca",
+    patch = "//third_party/tensorflow:tensorflow.patch",
 )
 
 # Import all of TensorFlow Serving's external dependencies.
diff --git a/tensorflow_serving/model_servers/BUILD b/tensorflow_serving/model_servers/BUILD
index 10550becc90..70719536255 100644
--- a/tensorflow_serving/model_servers/BUILD
+++ b/tensorflow_serving/model_servers/BUILD
@@ -466,7 +466,6 @@ cc_library(
         "//tensorflow_serving/servables/tensorflow:session_bundle_config_cc_proto",
         "@com_github_grpc_grpc//:grpc++",
         "@com_google_absl//absl/log",
-        "@com_google_absl//absl/strings:string_view",
         "@com_google_protobuf//:cc_wkt_protos",
         "@org_tensorflow//tensorflow/core:lib",
     ],
diff --git a/third_party/tensorflow/BUILD b/third_party/tensorflow/BUILD
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/third_party/tensorflow/tensorflow.patch b/third_party/tensorflow/tensorflow.patch
new file mode 100644
index 00000000000..0f64856d1ea
--- /dev/null
+++ b/third_party/tensorflow/tensorflow.patch
@@ -0,0 +1,26 @@
+diff --git a/tensorflow/core/grappler/optimizers/inference/BUILD b/tensorflow/core/grappler/optimizers/inference/BUILD
+index e96fd3bbc8e..89bc50f4936 100644
+--- a/tensorflow/core/grappler/optimizers/inference/BUILD
++++ b/tensorflow/core/grappler/optimizers/inference/BUILD
+@@ -19,7 +19,7 @@ tf_proto_library(
+     name = "batch_op_rewriter_proto",
+     srcs = ["batch_op_rewriter.proto"],
+     cc_api_version = 2,
+-    visibility = DEFAULT_VISIBILITY,
++    visibility = ["//visibility:public"],
+ )
+ 
+ # copybara:uncomment_begin(google-only)
+diff --git a/tensorflow/core/tfrt/graph_executor/BUILD b/tensorflow/core/tfrt/graph_executor/BUILD
+index 7cc355fa1b2..e31a61a3b52 100644
+--- a/tensorflow/core/tfrt/graph_executor/BUILD
++++ b/tensorflow/core/tfrt/graph_executor/BUILD
+@@ -204,6 +204,7 @@ tf_proto_library(
+     name = "test_config_proto",
+     testonly = True,
+     srcs = ["test_config.proto"],
++    visibility = ["//visibility:public"],
+ )
+ 
+ tf_cc_test(
+