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