[ros-diffs] [cgutman] 40724: - Fix build (try 2)