[ros-diffs] [jgardou] 46713: Fix build