am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev

* commit '525588c593794cf52d93665e9cf55f06abd3d1b7':
  Make NetworkMonitor less aggressive on broken networks.