Merge commit for internal changes

Resolved conflicts in :
tensorflow/compiler/xla/service/call_graph.cc
tensorflow/compiler/xla/service/call_graph.h
tensorflow/compiler/xla/service/call_graph_test.cc
tensorflow/core/BUILD
tensorflow/python/ops/image_ops_test.py