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

Change-Id: I998c14bc1ef65582b0a6715f8307c910c90f9c9b