Merge commit for internal changes

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

diff --cc tensorflow/contrib/lite/g3doc/tf_ops_compatibility.md
Simple merge

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

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

diff --cc tensorflow/core/BUILD
Simple merge

diff --cc tensorflow/core/grappler/costs/graph_properties.cc
Simple merge

diff --cc tensorflow/core/platform/default/build_config.bzl
Simple merge

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

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

diff --cc tensorflow/tools/api/generator/BUILD
index 3259406,f0c5877..5a9eb44
--- 1/tensorflow/tools/api/generator/BUILD
--- 2/tensorflow/tools/api/generator/BUILD
+++ b/tensorflow/tools/api/generator/BUILD
@@@ -23,122 -24,3 +24,4 @@@ py_test
          "//tensorflow/python:client_testlib",
      ],
  )
- genrule(
-     name = "python_api_gen",
-     # List of API files. This list should include file name for
-     # every module exported using tf_export. For e.g. if an op is decorated with
-     # @tf_export('module1.module2', 'module3'). Then, outs should include
-     # api/module1/module2/__init__.py and api/module3/__init__.py.
-     # keep sorted
-     outs = [
-         # BEGIN GENERATED FILES
-         "api/__init__.py",
-         "api/app/__init__.py",
-         "api/bitwise/__init__.py",
-         "api/compat/__init__.py",
-         "api/contrib/__init__.py",
-         "api/contrib/stat_summarizer/__init__.py",
-         "api/data/__init__.py",
-         "api/distributions/__init__.py",
-         "api/distributions/bijectors/__init__.py",
-         "api/errors/__init__.py",
-         "api/estimator/__init__.py",
-         "api/estimator/export/__init__.py",
-         "api/estimator/inputs/__init__.py",
-         "api/feature_column/__init__.py",
-         "api/gfile/__init__.py",
-         "api/graph_util/__init__.py",
-         "api/image/__init__.py",
-         "api/initializers/__init__.py",
-         "api/keras/__init__.py",
-         "api/keras/activations/__init__.py",
-         "api/keras/applications/__init__.py",
-         "api/keras/applications/densenet/__init__.py",
-         "api/keras/applications/inception_resnet_v2/__init__.py",
-         "api/keras/applications/inception_v3/__init__.py",
-         "api/keras/applications/mobilenet/__init__.py",
-         "api/keras/applications/nasnet/__init__.py",
-         "api/keras/applications/resnet50/__init__.py",
-         "api/keras/applications/vgg16/__init__.py",
-         "api/keras/applications/vgg19/__init__.py",
-         "api/keras/applications/xception/__init__.py",
-         "api/keras/backend/__init__.py",
-         "api/keras/callbacks/__init__.py",
-         "api/keras/constraints/__init__.py",
-         "api/keras/datasets/__init__.py",
-         "api/keras/datasets/boston_housing/__init__.py",
-         "api/keras/datasets/cifar10/__init__.py",
-         "api/keras/datasets/cifar100/__init__.py",
-         "api/keras/datasets/fashion_mnist/__init__.py",
-         "api/keras/datasets/imdb/__init__.py",
-         "api/keras/datasets/mnist/__init__.py",
-         "api/keras/datasets/reuters/__init__.py",
-         "api/keras/estimator/__init__.py",
-         "api/keras/initializers/__init__.py",
-         "api/keras/layers/__init__.py",
-         "api/keras/losses/__init__.py",
-         "api/keras/metrics/__init__.py",
-         "api/keras/models/__init__.py",
-         "api/keras/optimizers/__init__.py",
-         "api/keras/preprocessing/__init__.py",
-         "api/keras/preprocessing/image/__init__.py",
-         "api/keras/preprocessing/sequence/__init__.py",
-         "api/keras/preprocessing/text/__init__.py",
-         "api/keras/regularizers/__init__.py",
-         "api/keras/utils/__init__.py",
-         "api/keras/wrappers/__init__.py",
-         "api/keras/wrappers/scikit_learn/__init__.py",
-         "api/layers/__init__.py",
-         "api/linalg/__init__.py",
-         "api/logging/__init__.py",
-         "api/losses/__init__.py",
-         "api/manip/__init__.py",
-         "api/math/__init__.py",
-         "api/metrics/__init__.py",
-         "api/nn/__init__.py",
-         "api/nn/rnn_cell/__init__.py",
-         "api/profiler/__init__.py",
-         "api/python_io/__init__.py",
-         "api/resource_loader/__init__.py",
-         "api/strings/__init__.py",
-         "api/saved_model/__init__.py",
-         "api/saved_model/builder/__init__.py",
-         "api/saved_model/constants/__init__.py",
-         "api/saved_model/loader/__init__.py",
-         "api/saved_model/main_op/__init__.py",
-         "api/saved_model/signature_constants/__init__.py",
-         "api/saved_model/signature_def_utils/__init__.py",
-         "api/saved_model/tag_constants/__init__.py",
-         "api/saved_model/utils/__init__.py",
-         "api/sets/__init__.py",
-         "api/sparse/__init__.py",
-         "api/spectral/__init__.py",
-         "api/summary/__init__.py",
-         "api/sysconfig/__init__.py",
-         "api/test/__init__.py",
-         "api/train/__init__.py",
-         "api/train/queue_runner/__init__.py",
-         "api/user_ops/__init__.py",
-         # END GENERATED FILES
-     ],
-     # Optionally use PYTHON_BIN_PATH on Linux platforms so that python 3
-     # works. Windows has issues with the command so skip PYTHON_BIN_PATH
-     # for now.
-     cmd = select({
-         "@bazel_tools//src/conditions:windows": "",
-         "//conditions:default": "$${PYTHON_BIN_PATH} ",
-     }) + "$(location create_python_api) $(OUTS)",
-     tools = ["create_python_api"],
- )
- 
- py_library(
-     name = "python_api",
-     srcs = [":python_api_gen"],
-     srcs_version = "PY2AND3",
-     visibility = ["//tensorflow:__subpackages__"],
-     deps = [
-         "//tensorflow/contrib:contrib_py",  # keep
-         "//tensorflow/python",  # keep
-     ],
- )
 +

diff --cc tensorflow/tools/api/generator/create_python_api.py
index 1818209,de0a50a..4f3ca06
--- 1/tensorflow/tools/api/generator/create_python_api.py
--- 2/tensorflow/tools/api/generator/create_python_api.py
+++ b/tensorflow/tools/api/generator/create_python_api.py
@@@ -147,9 -147,8 +151,9 @@@ class _ModuleInitCodeBuilder(object)
      # the script outputs.
      module_text_map[''] = module_text_map.get('', '') + '''
  _names_with_underscore = [%s]
- __all__ = [s for s in dir() if not s.startswith('_')]
- __all__.extend([s for s in _names_with_underscore])
+ __all__ = [_s for _s in dir() if not _s.startswith('_')]
+ __all__.extend([_s for _s in _names_with_underscore])
 +__all__.remove('print_function')
  ''' % underscore_names_str
  
      return module_text_map
@@@ -274,8 -289,16 +294,20 @@@ def create_api_files
            module.replace('.', '/'))
        missing_output_files.append(module_file_path)
        continue
+     contents = ''
+     if module or not root_init_template:
+       contents = _GENERATED_FILE_HEADER + text
+     else:
+       # Read base init file
+       with open(root_init_template, 'r') as root_init_template_file:
+         contents = root_init_template_file.read()
+         contents = contents.replace('# API IMPORTS PLACEHOLDER', text)
      with open(module_name_to_file_path[module], 'w') as fp:
++<<<<<<< HEAD
 +      fp.write(_GENERATED_FILE_HEADER + text + _GENERATED_FILE_FOOTER)
++=======
+       fp.write(contents)
++>>>>>>> 2e272dbca6600991599e55a7ff7cfa668b8403aa
  
    if missing_output_files:
      raise ValueError(

diff --cc tensorflow/tools/pip_package/build_pip_package.sh
Simple merge

diff --cc tensorflow/workspace.bzl
Simple merge