[ros-diffs] [cgutman] 35610: - Apply the same change in my branch as I did to trunk in r35602