Merge commit for internal changes

Fixed merge conflicts by taking --theirs:
	tensorflow/core/common_runtime/executor.cc
	tensorflow/python/debug/cli/stepper_cli.py
	tensorflow/python/debug/cli/stepper_cli_test.py
	tensorflow/python/debug/stepper.py
	tensorflow/python/debug/stepper_test.py