Merge "usb: Address some API review comments" into sc-dev