Merge "Changes to OWNERS files for USB." into main