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