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