[ros-diffs] [hpoussin] 28809: Fix build #2