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