Merge commit for internal changes

diff --cc tensorflow/c/c_api_test.cc
Simple merge

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

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

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

diff --cc tensorflow/python/eager/backprop.py
Simple merge

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

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

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

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