[ros-diffs] [ion] 17848: fix build