Merge branch 'master' of https://github.com/ppwwyyxx/tensorflow into pr16817
authorMark Daoust <markdaoust@google.com>
Wed, 4 Apr 2018 18:55:50 +0000 (11:55 -0700)
committerMark Daoust <markdaoust@google.com>
Wed, 4 Apr 2018 18:55:50 +0000 (11:55 -0700)

Trivial merge