Merge "Add support for USB devices with multiple configurations and alternate interfaces"