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

* commit '1c532c2e2d8464ef7ddd0cc5914f3b1ab2dc49c2':
  Make UsbService optional