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