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