[ros-diffs] [janderwald] 22835: fix build