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