[ros-diffs] [janderwald] 41469: - Fix build