Internal Change.

PiperOrigin-RevId: 209637025

tensorflow/python/BUILD

@@ -143,6 +143,7 @@ py_library(
         "//tensorflow/python/profiler",
         "//tensorflow/python/saved_model",
         "//tensorflow/python/tools:component_api_helper",
+        "//tensorflow/python/tools/api/generator:create_python_api",
         "//third_party/py/numpy",
     ],
 )

tensorflow/python/tools/api/generator/BUILD

@@ -14,14 +14,13 @@ exports_files(
     ],
 )
 
-py_binary(
+py_library(
     name = "create_python_api",
     srcs = ["//tensorflow/python/tools/api/generator:create_python_api.py"],
-    main = "//tensorflow/python/tools/api/generator:create_python_api.py",
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
-        "//tensorflow/python:no_contrib",
+        "//tensorflow/python:util",
         "//tensorflow/python/tools/api/generator:doc_srcs",
     ],
 )

tensorflow/python/training/warm_starting_util.py

@@ -32,7 +32,7 @@ from tensorflow.python.training import saver
 from tensorflow.python.util.tf_export import tf_export
 
 
-@tf_export("train.VocabInfo", allow_multiple_exports=True)
+@tf_export("train.VocabInfo")
 class VocabInfo(
     collections.namedtuple("VocabInfo", [
         "new_vocab",

tensorflow/python/util/tf_export.py

@@ -213,4 +213,4 @@ class api_export(object):  # pylint: disable=invalid-name
 
 
 tf_export = functools.partial(api_export, api_name=TENSORFLOW_API_NAME)
-estimator_export = functools.partial(tf_export, api_name=ESTIMATOR_API_NAME)
+estimator_export = functools.partial(api_export, api_name=ESTIMATOR_API_NAME)