Merge "Added missing USB device descriptor fields needed for intent filters"