Merge pull request #10286 from jflyper/bfdev-fix-h7-use_usb_id-bug