Merge pull request #18812 from briansull/fix_610014
authorBrian Sullivan <briansul@microsoft.com>
Tue, 10 Jul 2018 20:01:41 +0000 (13:01 -0700)
committerGitHub <noreply@github.com>
Tue, 10 Jul 2018 20:01:41 +0000 (13:01 -0700)
Fix 610014


Trivial merge