[ros-diffs] [hpoussin] 30862: Fix build