Merge "Unhide ICMP echo constants." am: 82d1361e6d am: a09b83fc67
am: e93de65e84

Change-Id: Id8ddba07690a5e505bc4c5dc1be1a5ce8e4739f3