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

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