[ros-diffs] [hpoussin] 22093: Fix the build