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

Change-Id: I631487e6ccc500dd921ec04fa82713f35523dce8