Merge "Refactor based on new NetworkMonitor" am: 0d7ed7932d am: a6e8219c59
am: 107f6558cb

Change-Id: I7b5bb41d2e5d99a81565506a4274a38156e3afc2