3 files changed, 4 insertions, 3 deletions
diff --git a/tensorflow/tools/benchmark/BUILD b/tensorflow/tools/benchmark/BUILD
index ef7aa2398e..e926a45673 100644
--- a/tensorflow/tools/benchmark/BUILD
+++ b/tensorflow/tools/benchmark/BUILD
@@ -61,7 +61,7 @@ tf_cc_test(
 # --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
 #
 # NOTE: currently '-pthread' must be removed from the LINK_OPTS variable
-# in google/protobuf/BUILD to sucessfully build for Android. This is temporary
+# in @protobuf//:BUILD to sucessfully build for Android. This is temporary
 # pending an update of the version of the protobuf library that Tensorflow
 # uses.
 cc_binary(
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index dbf89e5bc6..0253f1e218 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -27,10 +27,10 @@ sh_binary(
         "MANIFEST.in",
         "README",
         "setup.py",
-        "//tensorflow/core:framework_headers",
         ":other_headers",
         ":simple_console",
         "//tensorflow:tensorflow_py",
+        "//tensorflow/core:framework_headers",
         "//tensorflow/examples/tutorials/mnist:package",
         "//tensorflow/models/embedding:package",
         "//tensorflow/models/image/alexnet:all_files",
diff --git a/tensorflow/tools/pip_package/build_pip_package.sh b/tensorflow/tools/pip_package/build_pip_package.sh
index 7f123937e8..fd60d1da6e 100755
--- a/tensorflow/tools/pip_package/build_pip_package.sh
+++ b/tensorflow/tools/pip_package/build_pip_package.sh
@@ -61,8 +61,9 @@ function main() {
 
   # protobuf pip package doesn't ship with header files. Copy the headers
   # over so user defined ops can be compiled.
+  mkdir -p ${TMPDIR}/google
   rsync --include "*/" --include "*.h" --exclude "*" --prune-empty-dirs -a \
-    $RUNFILES/google ${TMPDIR}
+    $RUNFILES/external/protobuf ${TMPDIR}/google
   rsync -a $RUNFILES/third_party/eigen3 ${TMPDIR}/third_party
 
   cp tensorflow/tools/pip_package/MANIFEST.in ${TMPDIR}