Merge pull request dotnet/coreclr#18696 from CarolEidt/Fix18362
authorCarol Eidt <carol.eidt@microsoft.com>
Fri, 29 Jun 2018 16:41:16 +0000 (09:41 -0700)
committerGitHub <noreply@github.com>
Fri, 29 Jun 2018 16:41:16 +0000 (09:41 -0700)
Fix & test for dotnet/coreclr#18362

Commit migrated from https://github.com/dotnet/coreclr/commit/13e760637a4162f825cad6ba6cc27706cb96feef


Trivial merge