Merge "Add test coverage for ICMP echo constants." am: 718025ed2c
am: 0f6be092bb

Change-Id: I337e4723ed1af668067148a479b9b21f9f29c330