Merge pull request dotnet/coreclr#11304 from pgavlin/GH11273
authorPat Gavlin <pgavlin@gmail.com>
Mon, 1 May 2017 19:31:25 +0000 (12:31 -0700)
committerGitHub <noreply@github.com>
Mon, 1 May 2017 19:31:25 +0000 (12:31 -0700)
Fix dotnet/coreclr#11273 by adjusting the fix for VSO 406163.

Commit migrated from https://github.com/dotnet/coreclr/commit/4a860230bd709a3bec1262156d5efe8e992c3e6f


Trivial merge