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