Fix #33732#36077

Merged

sandersn merged 3 commits intomicrosoft:masterfrom

jack-williams:fix33732

Mar 17, 2020

Commits on Jan 8, 2020

Fix #33732
jack-williams
committed

Commits on Mar 12, 2020

Merge branch 'master' into fix33732
jack-williams
committed

Commits on Mar 13, 2020

Remove code change but keep test
jack-williams
committed