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