[ros-diffs] [cgutman] 44165: - Fix build (try 2)