Merge "Ignore some more generic USB device names." into mnc-dev