[ros-diffs] [gedmurphy] 69343: Fix build (part 1 of ?)