Merge commit for internal changes

diff --cc tensorflow/contrib/cmake/tf_c.cmake
Simple merge

diff --cc tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h
Simple merge

diff --cc tensorflow/contrib/tensorrt/BUILD
Simple merge

diff --cc tensorflow/core/BUILD
Simple merge

diff --cc tensorflow/core/kernels/scoped_allocator_ops_test.cc
Simple merge

diff --cc tensorflow/core/ops/dataset_ops.cc
Simple merge

diff --cc tensorflow/docs_src/get_started/index.md
index 578080b,55579d5..232d2f1
--- 1/tensorflow/docs_src/get_started/index.md
--- 2/tensorflow/docs_src/get_started/index.md
+++ b/tensorflow/docs_src/get_started/index.md
@@@ -10,31 -10,13 +10,13 @@@ course prior to diving into TensorFlow 
  TensorFlow is a tool for machine learning. While it contains a wide range of
  functionality, TensorFlow is mainly designed for deep neural network models.
  
 -The easiest way to get started with TensorFlow is using Eager Execution.
 +The easiest way to get started with TensorFlow is by using Eager Execution.
  
 -  * @{$get_started/eager}, is for anyone new to  machine learning or TensorFlow.
 +  * @{$get_started/eager}, is for anyone new to machine learning or TensorFlow.
  
  TensorFlow provides many APIs. The remainder of this section focuses on the
- Estimator API which provide scalable, high-performance models.
- To get started with Estimators, begin by reading one of the following documents:
- 
-   * @{$get_started/get_started_for_beginners}, which is aimed at readers
-     new to machine learning.
-   * @{$get_started/premade_estimators}, which is aimed at readers who have
-     experience in machine learning.
- 
- Then, read the following documents, which demonstrate the key features
- in the high-level APIs:
- 
-   * @{$get_started/checkpoints}, which explains how to save training progress
-     and resume where you left off.
-   * @{$get_started/feature_columns}, which shows how an
-     Estimator can handle a variety of input data types without changes to the
-     model.
-   * @{$get_started/datasets_quickstart}, which introduces TensorFlow's
-     input pipelines.
-   * @{$get_started/custom_estimators}, which demonstrates how
-     to build and train models you design yourself.
+ Estimator API which provide scalable, high-performance models. See the
+ @{$estimators} guide.
  
  For more advanced users:
  

diff --cc tensorflow/docs_src/programmers_guide/estimators.md
Simple merge

diff --cc tensorflow/docs_src/programmers_guide/feature_columns.md
Simple merge

diff --cc tensorflow/go/op/wrappers.go
Simple merge

diff --cc tensorflow/java/src/gen/cc/java_defs.h
Simple merge

diff --cc tensorflow/java/src/gen/cc/op_generator.cc
index 284f675,debd95f..940390b
--- 1/tensorflow/java/src/gen/cc/op_generator.cc
--- 2/tensorflow/java/src/gen/cc/op_generator.cc
+++ b/tensorflow/java/src/gen/cc/op_generator.cc
@@@ -13,23 -13,23 +13,26 @@@ See the License for the specific langua
  limitations under the License.
  ==============================================================================*/
  
 +#include <string>
 +#include <map>
 +#include <vector>
  #include <list>
+ #include <map>
  #include <memory>
  #include <set>
+ #include <string>
+ #include <vector>
  
+ #include "tensorflow/core/framework/op_gen_lib.h"
  #include "tensorflow/core/lib/core/errors.h"
- #include "tensorflow/core/lib/strings/str_util.h"
  #include "tensorflow/core/lib/io/path.h"
 -#include "tensorflow/core/lib/strings/str_util.h"
 -#include "tensorflow/core/platform/env.h"
  #include "tensorflow/core/platform/logging.h"
 +#include "tensorflow/core/platform/env.h"
 +#include "tensorflow/core/framework/op_gen_lib.h"
  #include "tensorflow/java/src/gen/cc/java_defs.h"
- #include "tensorflow/java/src/gen/cc/source_writer.h"
  #include "tensorflow/java/src/gen/cc/op_generator.h"
  #include "tensorflow/java/src/gen/cc/op_specs.h"
+ #include "tensorflow/java/src/gen/cc/source_writer.h"
  
  namespace tensorflow {
  namespace java {

diff --cc tensorflow/java/src/gen/cc/op_generator.h
index cfe8420,05decd6..759d800
--- 1/tensorflow/java/src/gen/cc/op_generator.h
--- 2/tensorflow/java/src/gen/cc/op_generator.h
+++ b/tensorflow/java/src/gen/cc/op_generator.h
@@@ -19,10 -19,10 +19,10 @@@ limitations under the License
  #include <string>
  #include <vector>
  
 +#include "tensorflow/core/framework/op_def.pb.h"
  #include "tensorflow/core/framework/api_def.pb.h"
- #include "tensorflow/core/platform/env.h"
+ #include "tensorflow/core/framework/op_def.pb.h"
  #include "tensorflow/core/lib/core/status.h"
 -#include "tensorflow/core/platform/env.h"
  #include "tensorflow/java/src/gen/cc/op_specs.h"
  
  namespace tensorflow {

diff --cc tensorflow/java/src/gen/cc/source_writer.cc
index 56806cb,66401bd..8e5fba7
--- 1/tensorflow/java/src/gen/cc/source_writer.cc
--- 2/tensorflow/java/src/gen/cc/source_writer.cc
+++ b/tensorflow/java/src/gen/cc/source_writer.cc
@@@ -13,9 -13,9 +13,10 @@@ See the License for the specific langua
  limitations under the License.
  ==============================================================================*/
  
 +#include <string>
  #include <algorithm>
  #include <list>
+ #include <string>
  
  #include "tensorflow/java/src/gen/cc/source_writer.h"
  

diff --cc tensorflow/python/estimator/exporter.py
Simple merge

diff --cc tensorflow/python/estimator/keras.py
Simple merge

diff --cc tensorflow/python/framework/ops.py
Simple merge

diff --cc tensorflow/python/framework/ops_test.py
Simple merge

diff --cc tensorflow/python/keras/engine/network.py
Simple merge

diff --cc tensorflow/python/kernel_tests/py_func_test.py
Simple merge

diff --cc tensorflow/python/ops/image_ops_impl.py
Simple merge

diff --cc tensorflow/python/ops/nn_ops.py
Simple merge

diff --cc tensorflow/tools/dist_test/local_test.sh
Simple merge

diff --cc tensorflow/workspace.bzl
Simple merge