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