usb setup: update

Change-Id: I1cec6f0368f7fcc02c557e19f1c8c9498055f495
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1