More work on usb

Change-Id: I397a1b3d74de057af2650e18229e93920f2e81cc