am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev

* commit '9cb3b162ebf2c85b2b34d399623ff68427b2cdca':
  Hide UsbDevice changes in KKWT DO NOT MERGE