Merge commit for internal changes

diff --cc tensorflow/compiler/xla/python/xla_client_test.py
Simple merge

diff --cc tensorflow/contrib/cmake/CMakeLists.txt
Simple merge

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

diff --cc tensorflow/contrib/data/python/ops/scan_ops.py
Simple merge

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

diff --cc tensorflow/contrib/makefile/download_dependencies.sh
Simple merge

diff --cc tensorflow/contrib/meta_graph_transform/meta_graph_transform.py
Simple merge

diff --cc tensorflow/core/BUILD
Simple merge

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

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

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

diff --cc tensorflow/workspace.bzl
Simple merge