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