am a4ee3088: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'a4ee3088e74bb9b38dcd469df4dc929f1c935ff3':
  Recover from corrupt network stats.