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