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