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