Merge pull request #18433 from samikama/plugin_master_pr
authorgracehoney <31743510+aaroey@users.noreply.github.com>
Tue, 15 May 2018 18:09:06 +0000 (11:09 -0700)
committerGitHub <noreply@github.com>
Tue, 15 May 2018 18:09:06 +0000 (11:09 -0700)
[tftrt update]


Trivial merge