Merge branch 'master' of https://github.com/tensorflow/tensorflow into plugin_master_pr
authorgracehoney <31743510+aaroey@users.noreply.github.com>
Tue, 15 May 2018 17:09:00 +0000 (10:09 -0700)
committergracehoney <31743510+aaroey@users.noreply.github.com>
Tue, 15 May 2018 17:09:00 +0000 (10:09 -0700)

Trivial merge