am f6340264: am 4f84a135: am 14409d08: am 0da31f0a: am 9d374093: Correctly fix the ping

* commit 'f634026464cbb637fc988eb20d267a7b07edc588':
  Correctly fix the ping