Merge commit for internal changes

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

diff --cc tensorflow/contrib/py2tf/converters/BUILD
Simple merge

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

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

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

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

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

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

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

diff --cc tensorflow/python/ops/losses/losses_impl.py
Simple merge

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

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

diff --cc tensorflow/workspace.bzl
Simple merge