Merge "usb: Add owner file"