Cherry pick #2397 to master (missed changes)#2403

nohwnd merged 1 commit intomastermicrosoft/vstest:masterfrom

dev/vrbhardw/2397-to-mastermicrosoft/vstest:dev/vrbhardw/2397-to-masterCopy head branch name to clipboard