Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev