Merge pull request #902 from netfs/branch_198492081

**Upstream changes from internal**

WORKSPACE

@@ -11,8 +11,8 @@ load("//tensorflow_serving:repo.bzl", "tensorflow_http_archive")
 
 tensorflow_http_archive(
     name = "org_tensorflow",
-    sha256 = "cbd96914936ce3aacc39e02c2efb711f937f8ebcda888c349eab075185d7c914",
-    git_commit = "d8fac4cb80eb0c42d2550bcb720a80d29fc5f22d",
+    sha256 = "876f800cf9605375c4a05daf44bc280bcb85ef5b302a9c01592a828c61647574",
+    git_commit = "694892d4c0fba6bd4322e943f8b1483b36f1ae99",
 )
 
 # TensorFlow depends on "io_bazel_rules_closure" so we need this here.

tensorflow_serving/apis/BUILD

@@ -146,6 +146,20 @@ serving_proto_library(
     ],
 )
 
+serving_proto_library_py(
+    name = "prediction_log_proto_py_pb2",
+    srcs = ["prediction_log.proto"],
+    proto_library = "prediction_log_proto",
+    deps = [
+        ":classification_proto_py_pb2",
+        ":inference_proto_py_pb2",
+        ":predict_proto_py_pb2",
+        ":regression_proto_py_pb2",
+        ":session_service_proto_py_pb2",
+        "//tensorflow_serving/core:logging_proto_py_pb2",
+    ],
+)
+
 serving_proto_library(
     name = "prediction_service_proto",
     srcs = ["prediction_service.proto"],
@@ -351,6 +365,16 @@ serving_proto_library(
     ],
 )
 
+serving_proto_library_py(
+    name = "session_service_proto_py_pb2",
+    srcs = ["session_service.proto"],
+    proto_library = "session_service_proto",
+    deps = [
+        ":model_proto_py_pb2",
+        "@org_tensorflow//tensorflow/core:protos_all_py",
+    ],
+)
+
 tf_pyclif_proto_library(
     name = "regression_pyclif",
     proto_lib = ":regression_proto",

tensorflow_serving/config/BUILD

@@ -57,6 +57,14 @@ serving_proto_library(
     ],
 )
 
+serving_proto_library_py(
+    name = "log_collector_config_proto_py_pb2",
+    srcs = ["log_collector_config.proto"],
+    proto_library = "log_collector_config_proto",
+    deps = [
+    ],
+)
+
 serving_proto_library(
     name = "logging_config_proto",
     srcs = ["logging_config.proto"],
@@ -66,3 +74,12 @@ serving_proto_library(
         ":log_collector_config_proto",
     ],
 )
+
+serving_proto_library_py(
+    name = "logging_config_proto_py_pb2",
+    srcs = ["logging_config.proto"],
+    proto_library = "logging_config_proto",
+    deps = [
+        ":log_collector_config_proto_py_pb2",
+    ],
+)

tensorflow_serving/core/BUILD

@@ -733,6 +733,7 @@ cc_test(
 )
 
 load("//tensorflow_serving:serving.bzl", "serving_proto_library")
+load("//tensorflow_serving:serving.bzl", "serving_proto_library_py")
 
 serving_proto_library(
     name = "logging_proto",
@@ -748,6 +749,19 @@ serving_proto_library(
     ],
 )
 
+serving_proto_library_py(
+    name = "logging_proto_py_pb2",
+    srcs = ["logging.proto"],
+    proto_library = "logging_proto",
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        "//tensorflow_serving/apis:model_proto_py_pb2",
+        "//tensorflow_serving/config:logging_config_proto_py_pb2",
+    ],
+)
+
 cc_library(
     name = "request_logger",
     srcs = ["request_logger.cc"],

tensorflow_serving/core/test_util/BUILD

@@ -26,6 +26,7 @@ cc_library(
     testonly = 1,
     srcs = ["test_main.cc"],
     linkopts = ["-lm"],
+    tags = ["keep_dep"],  # Tell build_cleaner to keep dependencies on this.
     deps = [
         "@com_google_googletest//:gtest",
         "@org_tensorflow//tensorflow/core:testlib",