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