[ros-diffs] [hpoussin] 32846: Try to fix build