[ros-diffs] [cgutman] 40723: - Fix build