Merge "Make UsbService optional" into klp-modular-dev