am 5aa34455: (-s ours) am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev

* commit '5aa34455d7d921f33b67463cd58b879d5cfcf1ca':
  Hide UsbDevice changes in KKWT DO NOT MERGE