am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2

* commit '2488a94350e0c0b088da2646557c9a0f3a0e9847':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."