am a991e025: am 85890d94: Merge "Fix a bug with the delayed ping not being restarted" into ub-gmail-ur14-dev

* commit 'a991e025ecf45f590eb4eaa524d6f6701ecfa3fd':
  Fix a bug with the delayed ping not being restarted