Merge "Check black-listed USB class before descriptor"