Merge commit for internal changes

tensorflow_serving/g3doc/setup.md

@@ -13,9 +13,8 @@ If you have the prerequisites for Bazel, those instructions consist of the
 following steps:
 
 1.  Download the relevant binary from
-    [here](https://github.com/bazelbuild/bazel/releases).
-    Let's say you downloaded bazel-0.5.4-installer-linux-x86_64.sh. You would
-    execute:
+    [here](https://github.com/bazelbuild/bazel/releases). Let's say you
+    downloaded bazel-0.5.4-installer-linux-x86_64.sh. You would execute:
 
     <pre>
     cd ~/Downloads

tensorflow_serving/model_servers/BUILD

@@ -136,6 +136,7 @@ cc_binary(
         "@org_tensorflow//tensorflow/core:lib",
         "@org_tensorflow//tensorflow/core/platform/cloud:gcs_file_system",
         "@org_tensorflow//tensorflow/core/platform/hadoop:hadoop_file_system",
+        "@org_tensorflow//tensorflow/core/platform/s3:s3_file_system",
         "//tensorflow_serving/apis:prediction_service_proto",
         "//tensorflow_serving/config:model_server_config_proto",
         "//tensorflow_serving/core:availability_preserving_policy",

tensorflow_serving/tools/docker/Dockerfile.devel-gpu

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-RUN apt-get install python-pip python-dev build-essential 
+RUN apt-get install python-pip python-dev build-essential
 
 #RUN curl -fSsL -O https://bootstrap.pypa.io/get-pip.py && \
 #    python get-pip.py && \

tensorflow_serving/util/class_registration.h

@@ -268,7 +268,7 @@ class ClassRegistry {
             ->New());
     if (!any_config.UnpackTo(config.get())) {
       return errors::InvalidArgument("Malformed content of Any: ",
-          any_config.DebugString());
+                                     any_config.DebugString());
     }
     return Create(*config, std::forward<AdditionalFactoryArgs>(args)...,
                   result);