We apparently never matched the USB interface class. Let's fix that. Prompted by: #15676 (cherry picked from commit 1b1b7b44)