am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev

* commit '4b07b26e8654df52ca80bb2165ebdf9352ab9337':
  Make UsbService optional