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