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

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