[ros-diffs] [tkreuzer] 50649: [USB] Fix merge artifact