fork cm ping & ping6

Change-Id: I064e3c223072dc9de96c1c4a78a1a63016423576