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