[ros-diffs] [jimtabor] 51306: - Fix build