Merge commit for internal changes

diff --cc tensorflow/compiler/jit/mark_for_compilation_pass.cc
Simple merge

diff --cc tensorflow/contrib/autograph/converters/call_trees.py
Simple merge

diff --cc tensorflow/contrib/autograph/impl/api.py
Simple merge

diff --cc tensorflow/contrib/autograph/impl/conversion.py
Simple merge

diff --cc tensorflow/contrib/data/__init__.py
Simple merge

diff --cc tensorflow/contrib/data/python/kernel_tests/BUILD
Simple merge

diff --cc tensorflow/contrib/data/python/ops/BUILD
index a1a5c9e,7c28d1f..0e45908
--- 1/tensorflow/contrib/data/python/ops/BUILD
--- 2/tensorflow/contrib/data/python/ops/BUILD
+++ b/tensorflow/contrib/data/python/ops/BUILD
@@@ -101,20 -108,36 +108,37 @@@ py_library
  )
  
  py_library(
-     name = "transformation_ops",
-     srcs = [
-         "batching.py",
-         "enumerate_ops.py",
-         "error_ops.py",
-         "grouping.py",
-         "interleave_ops.py",
-         "resampling.py",
-         "scan_ops.py",
-         "sliding.py",
-         "stats_ops.py",
-         "threadpool.py",
-         "unique.py",
+     name = "batching",
+     srcs = ["batching.py"],
+     srcs_version = "PY2AND3",
+     deps = [
++        "//tensorflow/contrib/framework:framework_py",
+         "//tensorflow/python:array_ops",
+         "//tensorflow/python:dataset_ops_gen",
+         "//tensorflow/python:dtypes",
+         "//tensorflow/python:framework_ops",
+         "//tensorflow/python:math_ops",
+         "//tensorflow/python:tensor_shape",
+         "//tensorflow/python:tensor_util",
+         "//tensorflow/python/data/ops:dataset_ops",
+         "//tensorflow/python/data/util:nest",
+         "//tensorflow/python/data/util:sparse",
      ],
+ )
+ 
+ py_library(
+     name = "enumerate_ops",
+     srcs = ["enumerate_ops.py"],
+     srcs_version = "PY2AND3",
+     deps = [
+         "//tensorflow/python:dtypes",
+         "//tensorflow/python/data/ops:dataset_ops",
+     ],
+ )
+ 
+ py_library(
+     name = "error_ops",
+     srcs = ["error_ops.py"],
      srcs_version = "PY2AND3",
      deps = [
          ":contrib_op_loader",

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

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

diff --cc tensorflow/core/kernels/BUILD
Simple merge

diff --cc tensorflow/python/BUILD
Simple merge

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

diff --cc tensorflow/python/framework/dtypes_test.py
index 478733e,e55783b..7c2169b
--- 1/tensorflow/python/framework/dtypes_test.py
--- 2/tensorflow/python/framework/dtypes_test.py
+++ b/tensorflow/python/framework/dtypes_test.py
@@@ -295,9 -295,15 +295,19 @@@ class TypesTest(test_util.TensorFlowTes
      self.assertNotEqual(dtypes.int32, int)
      self.assertNotEqual(dtypes.float64, 2.1)
  
 +  def testPythonTypesConversion(self):
 +    self.assertIs(dtypes.float32, dtypes.as_dtype(float))
 +    self.assertIs(dtypes.bool, dtypes.as_dtype(bool))
 +
+   def testReduce(self):
+     for enum in dtypes._TYPE_TO_STRING:
+       dtype = dtypes.DType(enum)
+       ctor, args = dtype.__reduce__()
+       self.assertEquals(ctor, dtypes.as_dtype)
+       self.assertEquals(args, (dtype.name,))
+       reconstructed = ctor(*args)
+       self.assertEquals(reconstructed, dtype)
+ 
+ 
  if __name__ == "__main__":
    googletest.main()

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

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

diff --cc tensorflow/python/keras/_impl/keras/layers/normalization.py
Simple merge

diff --cc tensorflow/tools/docs/generate_lib.py
Simple merge

diff --cc tensorflow/workspace.bzl
Simple merge