diff --git a/tensorflow/core/profiler/rpc/BUILD b/tensorflow/core/profiler/rpc/BUILD
index 394c582b3f0..3ecec434ade 100644
--- a/tensorflow/core/profiler/rpc/BUILD
+++ b/tensorflow/core/profiler/rpc/BUILD
@@ -1,3 +1,5 @@
+load("//tensorflow:tensorflow.bzl", "tf_external_workspace_visible")
+
 package(
     licenses = ["notice"],  # Apache 2.0
 )
@@ -7,7 +9,9 @@ cc_library(
     srcs = ["profiler_service_impl.cc"],
     hdrs = ["profiler_service_impl.h"],
     features = ["-layering_check"],
-    visibility = ["//tensorflow_serving/model_servers:__pkg__"],
+    visibility = tf_external_workspace_visible(
+        ["//tensorflow_serving/model_servers:__pkg__"],
+    ),
     deps = [
         "//tensorflow:grpc++",
         "//tensorflow/core:framework",
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index e8c26a028d8..da94bea7545 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -2213,6 +2213,15 @@ def tf_py_test(
     if grpc_enabled:
         deps = deps + tf_additional_grpc_deps_py()
 
+    # NOTE(ebrevdo): This is a workaround for depset() not being able to tell
+    # the difference between 'dep' and 'clean_dep(dep)'.
+    for to_add in [
+        "//tensorflow/python:extra_py_tests_deps",
+        "//tensorflow/python:gradient_checker",
+    ]:
+        if to_add not in deps:
+            deps.append(clean_dep(to_add))
+
     # Python version placeholder
     kwargs.setdefault("srcs_version", "PY2AND3")
     py_test(
@@ -2228,10 +2237,7 @@ def tf_py_test(
         tags = tags,
         visibility = [clean_dep("//tensorflow:internal")] +
                      additional_visibility,
-        deps = depset([
-            clean_dep("//tensorflow/python:extra_py_tests_deps"),
-            clean_dep("//tensorflow/python:gradient_checker"),
-        ] + deps + xla_test_true_list),
+        deps = depset(deps + xla_test_true_list),
         **kwargs
     )