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