Merge pull request #121059 from syntaxerror247/change-instrumented-test-device