diff --git a/tensorflow/core/profiler/BUILD b/tensorflow/core/profiler/BUILD
index 88020753072..bfb9a893765 100644
--- a/tensorflow/core/profiler/BUILD
+++ b/tensorflow/core/profiler/BUILD
@@ -21,13 +21,6 @@ package_group(
     ],
 )
 
-tf_proto_library(
-    name = "op_profile_proto",
-    srcs = ["op_profile.proto"],
-    cc_api_version = 2,
-    visibility = [":internal"],
-)
-
 tf_proto_library(
     name = "profiler_service_monitor_result_proto",
     srcs = ["profiler_service_monitor_result.proto"],
diff --git a/tensorflow/core/profiler/protobuf/BUILD b/tensorflow/core/profiler/protobuf/BUILD
index 64e9ecbc0b2..89a173487ad 100644
--- a/tensorflow/core/profiler/protobuf/BUILD
+++ b/tensorflow/core/profiler/protobuf/BUILD
@@ -62,6 +62,13 @@ tf_proto_library(
     ],
 )
 
+tf_proto_library(
+    name = "op_profile_proto",
+    srcs = ["op_profile.proto"],
+    cc_api_version = 2,
+    visibility = [":friends"],
+)
+
 tf_proto_library(
     name = "op_stats_proto",
     srcs = ["op_stats.proto"],
diff --git a/tensorflow/core/profiler/op_profile.proto b/tensorflow/core/profiler/protobuf/op_profile.proto
similarity index 100%
rename from tensorflow/core/profiler/op_profile.proto
rename to tensorflow/core/profiler/protobuf/op_profile.proto