[ros-diffs] [janderwald] 44329: Fix build breakage