Merge pull request #19040 from tensorflow/merge_branch
authorAmit Patankar <amitpatankar@google.com>
Thu, 3 May 2018 14:18:04 +0000 (07:18 -0700)
committerGitHub <noreply@github.com>
Thu, 3 May 2018 14:18:04 +0000 (07:18 -0700)
Merge r1.8 back to master after 1.8.0 release.


Trivial merge