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