[ros-diffs] [cgutman] 36277: - Fix another build error