Merge commit for internal changes

diff --cc configure.py
Simple merge

diff --cc tensorflow/compiler/xla/service/hlo_evaluator.cc
Simple merge

diff --cc tensorflow/compiler/xla/service/layout_assignment.h
Simple merge

diff --cc tensorflow/compiler/xla/tests/tuple_test.cc
Simple merge

diff --cc tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h
Simple merge

diff --cc tensorflow/contrib/lite/testing/generate_examples.py
Simple merge

diff --cc tensorflow/contrib/lite/toco/import_tensorflow.cc
Simple merge

diff --cc tensorflow/contrib/lite/toco/tflite/operator.h
Simple merge

diff --cc tensorflow/core/BUILD
Simple merge

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

diff --cc tensorflow/core/platform/cloud/gcs_file_system.cc
Simple merge

diff --cc tensorflow/core/util/tensor_format.h
Simple merge

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

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

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

diff --cc tensorflow/python/feature_column/feature_column.py
Simple merge

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

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

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

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

diff --cc tensorflow/python/keras/utils/__init__.py
index 9d924c8,7b5eecc..69337b6
--- 1/tensorflow/python/keras/utils/__init__.py
--- 2/tensorflow/python/keras/utils/__init__.py
+++ b/tensorflow/python/keras/utils/__init__.py
@@@ -18,23 -18,22 +18,23 @@@ from __future__ import absolute_impor
  from __future__ import division
  from __future__ import print_function
  
- from tensorflow.python.keras._impl.keras.utils.data_utils import GeneratorEnqueuer
- from tensorflow.python.keras._impl.keras.utils.data_utils import get_file
- from tensorflow.python.keras._impl.keras.utils.data_utils import OrderedEnqueuer
- from tensorflow.python.keras._impl.keras.utils.data_utils import Sequence
- from tensorflow.python.keras._impl.keras.utils.data_utils import SequenceEnqueuer
- from tensorflow.python.keras._impl.keras.utils.generic_utils import custom_object_scope
- from tensorflow.python.keras._impl.keras.utils.generic_utils import CustomObjectScope
- from tensorflow.python.keras._impl.keras.utils.generic_utils import deserialize_keras_object
- from tensorflow.python.keras._impl.keras.utils.generic_utils import get_custom_objects
- from tensorflow.python.keras._impl.keras.utils.generic_utils import Progbar
- from tensorflow.python.keras._impl.keras.utils.generic_utils import serialize_keras_object
- from tensorflow.python.keras._impl.keras.utils.io_utils import HDF5Matrix
- from tensorflow.python.keras._impl.keras.utils.layer_utils import convert_all_kernels_in_model
- from tensorflow.python.keras._impl.keras.utils.multi_gpu_utils import multi_gpu_model
- from tensorflow.python.keras._impl.keras.utils.np_utils import normalize
- from tensorflow.python.keras._impl.keras.utils.np_utils import to_categorical
- from tensorflow.python.keras._impl.keras.utils.vis_utils import plot_model
+ from tensorflow.python.keras.utils.data_utils import GeneratorEnqueuer
+ from tensorflow.python.keras.utils.data_utils import get_file
++from tensorflow.python.keras.utils.data_utils import OrderedEnqueuer
+ from tensorflow.python.keras.utils.data_utils import Sequence
+ from tensorflow.python.keras.utils.data_utils import SequenceEnqueuer
+ from tensorflow.python.keras.utils.generic_utils import custom_object_scope
+ from tensorflow.python.keras.utils.generic_utils import CustomObjectScope
+ from tensorflow.python.keras.utils.generic_utils import deserialize_keras_object
+ from tensorflow.python.keras.utils.generic_utils import get_custom_objects
+ from tensorflow.python.keras.utils.generic_utils import Progbar
+ from tensorflow.python.keras.utils.generic_utils import serialize_keras_object
+ from tensorflow.python.keras.utils.io_utils import HDF5Matrix
+ from tensorflow.python.keras.utils.layer_utils import convert_all_kernels_in_model
+ from tensorflow.python.keras.utils.multi_gpu_utils import multi_gpu_model
+ from tensorflow.python.keras.utils.np_utils import normalize
+ from tensorflow.python.keras.utils.np_utils import to_categorical
+ from tensorflow.python.keras.utils.vis_utils import plot_model
  
  del absolute_import
  del division

diff --cc tensorflow/python/kernel_tests/distributions/util_test.py
Simple merge

diff --cc tensorflow/python/layers/base.py
Simple merge

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

diff --cc tensorflow/python/util/tf_inspect.py
Simple merge

diff --cc tensorflow/stream_executor/cuda/cuda_blas.cc
Simple merge

diff --cc tensorflow/workspace.bzl
Simple merge