Merge vmullig/update_tensorflow_version into Sergey's "benchmark" branch. Done with Sergey's permission. Sergey: REVERT THIS MERGE (or rewrite history) if you no longer want this in the "benchmark" branch.

• Summary