[ros-diffs] [cgutman] 36742: - Fix branch build