[ros-diffs] [cgutman] 37325: - Add back some ROS-specific stuff