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