[ros-diffs] [hyperion] 42452: See r42442. One of the affected files was duplicated, so we duplicate the fix