[ros-diffs] [gedmurphy] 22326: fix build