[ros-diffs] [ion] 16221: Fix build