Merge "Update UsbService to V1_1 usb hal"