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