[ros-diffs] [cgutman] 40477: - Fix release build (try 1)