diff --git a/tensorflow/compiler/jit/tests/BUILD b/tensorflow/compiler/jit/tests/BUILD
index 88ce43902fd..49206e7e6b1 100644
--- a/tensorflow/compiler/jit/tests/BUILD
+++ b/tensorflow/compiler/jit/tests/BUILD
@@ -1,7 +1,7 @@
 load("//tensorflow/core/platform:rules_cc.bzl", "cc_library")
 load("//tensorflow:tensorflow.bzl", "tf_cc_test")
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 package(default_visibility = ["//visibility:private"])
 
diff --git a/tensorflow/compiler/mlir/lite/python/BUILD b/tensorflow/compiler/mlir/lite/python/BUILD
index dd7f68f72ff..555d5189f16 100644
--- a/tensorflow/compiler/mlir/lite/python/BUILD
+++ b/tensorflow/compiler/mlir/lite/python/BUILD
@@ -1,6 +1,6 @@
 load("//tensorflow/core/platform:rules_cc.bzl", "cc_library")
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 package(default_visibility = [":friends"])
 
diff --git a/tensorflow/compiler/xla/python/tpu_driver/BUILD b/tensorflow/compiler/xla/python/tpu_driver/BUILD
index 4f282381731..c98768e07bc 100644
--- a/tensorflow/compiler/xla/python/tpu_driver/BUILD
+++ b/tensorflow/compiler/xla/python/tpu_driver/BUILD
@@ -7,7 +7,7 @@ load(
     "go_grpc_library",
 )
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/tensorflow/core/framework/registration/BUILD b/tensorflow/core/framework/registration/BUILD
index 39f9cce7156..642188fbe27 100644
--- a/tensorflow/core/framework/registration/BUILD
+++ b/tensorflow/core/framework/registration/BUILD
@@ -9,7 +9,7 @@ package(
     default_visibility = [
         "//tensorflow/core:__subpackages__",
     ],
-    licenses = ["notice"],  # Apache 2.0
+    licenses = ["notice"],
 )
 
 exports_files(
diff --git a/tensorflow/core/kernels/rnn/BUILD b/tensorflow/core/kernels/rnn/BUILD
index 104cc1eba03..8c06b126dc3 100644
--- a/tensorflow/core/kernels/rnn/BUILD
+++ b/tensorflow/core/kernels/rnn/BUILD
@@ -19,7 +19,7 @@ package(
     default_visibility = ["//tensorflow:internal"],
 )
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 tf_gpu_library(
     name = "blas_gemm",
diff --git a/tensorflow/lite/delegates/flex/java/src/main/java/org/tensorflow/lite/flex/BUILD b/tensorflow/lite/delegates/flex/java/src/main/java/org/tensorflow/lite/flex/BUILD
index 843de3a6f12..b186724cbb8 100644
--- a/tensorflow/lite/delegates/flex/java/src/main/java/org/tensorflow/lite/flex/BUILD
+++ b/tensorflow/lite/delegates/flex/java/src/main/java/org/tensorflow/lite/flex/BUILD
@@ -1,4 +1,4 @@
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 filegroup(
     name = "flex_delegate",
diff --git a/tensorflow/lite/delegates/flex/java/src/main/native/BUILD b/tensorflow/lite/delegates/flex/java/src/main/native/BUILD
index b9f8cfc1206..d0dfd3515d8 100644
--- a/tensorflow/lite/delegates/flex/java/src/main/native/BUILD
+++ b/tensorflow/lite/delegates/flex/java/src/main/native/BUILD
@@ -6,7 +6,7 @@ load("//tensorflow/lite:build_def.bzl", "tflite_copts")
 
 package(default_visibility = ["//visibility:public"])
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 exports_files(
     srcs = ["flex_delegate_jni.cc"],
diff --git a/tensorflow/lite/delegates/hexagon/java/src/main/java/org/tensorflow/lite/BUILD b/tensorflow/lite/delegates/hexagon/java/src/main/java/org/tensorflow/lite/BUILD
index 535bdf1fd22..5565c0c4903 100644
--- a/tensorflow/lite/delegates/hexagon/java/src/main/java/org/tensorflow/lite/BUILD
+++ b/tensorflow/lite/delegates/hexagon/java/src/main/java/org/tensorflow/lite/BUILD
@@ -1,4 +1,4 @@
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 filegroup(
     name = "hexagon_delegate",
diff --git a/tensorflow/lite/delegates/hexagon/java/src/main/native/BUILD b/tensorflow/lite/delegates/hexagon/java/src/main/native/BUILD
index d92dbef4ec4..360f9eb05dd 100644
--- a/tensorflow/lite/delegates/hexagon/java/src/main/native/BUILD
+++ b/tensorflow/lite/delegates/hexagon/java/src/main/native/BUILD
@@ -2,11 +2,11 @@
 # Java Native Interface (JNI) library intended for implementing the
 # TensorFlow Lite Hexagon delegate Java API using the TensorFlow Lite CC library.
 
-package(default_visibility = ["//tensorflow/lite/delegates/hexagon/java:__subpackages__"])
-
 load("//tensorflow/lite:build_def.bzl", "tflite_copts")
 
-licenses(["notice"])  # Apache 2.0
+package(default_visibility = ["//tensorflow/lite/delegates/hexagon/java:__subpackages__"])
+
+licenses(["notice"])
 
 cc_library(
     name = "native",
diff --git a/tensorflow/python/framework/BUILD b/tensorflow/python/framework/BUILD
index 929a69de4f7..65b3280e34b 100644
--- a/tensorflow/python/framework/BUILD
+++ b/tensorflow/python/framework/BUILD
@@ -19,7 +19,7 @@ visibility = [
 
 package(
     default_visibility = visibility,
-    licenses = ["notice"],  # Apache 2.0
+    licenses = ["notice"],
 )
 
 tf_cc_shared_object(
diff --git a/tensorflow/python/tpu/client/pip_package/BUILD b/tensorflow/python/tpu/client/pip_package/BUILD
index 9e979f1c31e..d060044f740 100644
--- a/tensorflow/python/tpu/client/pip_package/BUILD
+++ b/tensorflow/python/tpu/client/pip_package/BUILD
@@ -3,7 +3,7 @@
 
 package(default_visibility = ["//visibility:private"])
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 sh_binary(
     name = "build_pip_package",
diff --git a/tensorflow/stream_executor/platform/default/BUILD b/tensorflow/stream_executor/platform/default/BUILD
index ce9731e994f..4948bc21a8d 100644
--- a/tensorflow/stream_executor/platform/default/BUILD
+++ b/tensorflow/stream_executor/platform/default/BUILD
@@ -1,7 +1,7 @@
 load("//tensorflow/core/platform:rules_cc.bzl", "cc_library")
 load("//tensorflow:tensorflow.bzl", "tf_copts")
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 package(default_visibility = ["//tensorflow/stream_executor:__subpackages__"])
 
diff --git a/tensorflow/tools/consistency_integration_test/BUILD b/tensorflow/tools/consistency_integration_test/BUILD
index f18f3715236..de321fa3a99 100644
--- a/tensorflow/tools/consistency_integration_test/BUILD
+++ b/tensorflow/tools/consistency_integration_test/BUILD
@@ -14,7 +14,7 @@ load(
 
 package(
     default_visibility = ["//tensorflow/tools/consistency_integration_test:__subpackages__"],
-    licenses = ["notice"],  # Apache 2.0
+    licenses = ["notice"],
 )
 
 licenses(["notice"])
diff --git a/tensorflow/tools/tensorflow_builder/compat_checker/BUILD b/tensorflow/tools/tensorflow_builder/compat_checker/BUILD
index c496e286275..f641ca13ad5 100644
--- a/tensorflow/tools/tensorflow_builder/compat_checker/BUILD
+++ b/tensorflow/tools/tensorflow_builder/compat_checker/BUILD
@@ -5,7 +5,7 @@ load(
     "py_test",
 )
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 package(
     default_visibility = [
@@ -13,7 +13,7 @@ package(
     ],
 )
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 py_library(
     name = "compat_checker",
diff --git a/third_party/hadoop/BUILD b/third_party/hadoop/BUILD
index 563136afe3a..5381e84cc96 100644
--- a/third_party/hadoop/BUILD
+++ b/third_party/hadoop/BUILD
@@ -1,6 +1,6 @@
 package(
     default_visibility = ["//visibility:public"],
-    licenses = ["notice"],  # Apache 2.0
+    licenses = ["notice"],
 )
 
 exports_files(["LICENSE.txt"])
diff --git a/third_party/ruy/BUILD b/third_party/ruy/BUILD
index 4cf3dae270f..be4e6bb1268 100644
--- a/third_party/ruy/BUILD
+++ b/third_party/ruy/BUILD
@@ -2,7 +2,7 @@
 
 package(
     default_visibility = ["//visibility:public"],
-    licenses = ["notice"],  # Apache 2.0
+    licenses = ["notice"],
 )
 
 # The LICENSE from this package is used during pip package generation.