am c21994bc: Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom

* commit 'c21994bc26df959d1a7161e38b4402b7255ea321':
  Fix watchdog to stop ping after wifi disconnects