diff --git a/tensorflow/core/api_def/BUILD b/tensorflow/core/api_def/BUILD
index f9e2adaec6b..b1ced361927 100644
--- a/tensorflow/core/api_def/BUILD
+++ b/tensorflow/core/api_def/BUILD
@@ -33,9 +33,9 @@ filegroup(
     visibility = ["//tensorflow:internal"],
 )
 
-filegroup(
+alias(
     name = "python_api_def",
-    srcs = glob(["python_api/*"]),
+    actual = "//tensorflow/core/api_def/python_api:python_api_def",
     visibility = ["//tensorflow:internal"],
 )
 
diff --git a/tensorflow/core/api_def/python_api/BUILD b/tensorflow/core/api_def/python_api/BUILD
new file mode 100644
index 00000000000..f5d41a3006a
--- /dev/null
+++ b/tensorflow/core/api_def/python_api/BUILD
@@ -0,0 +1,15 @@
+# Description:
+#   Provides ApiDef access and ApiDef validation for TensorFlow python.
+
+load("//tensorflow:tensorflow.bzl", "filegroup")
+
+package(
+    default_visibility = ["//tensorflow:internal"],
+    licenses = ["notice"],  # Apache 2.0
+)
+
+filegroup(
+    name = "python_api_def",
+    srcs = glob(["*"]),
+    visibility = ["//tensorflow:internal"],
+)