[ros-diffs] [cgutman] 40215: - Fix ICMP