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