[ros-diffs] [cgutman] 36593: - Code cleanup