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