TEST: update usb tests and guard them with macro #12498
+36
−8
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.