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

Change-Id: I6f2f42dee11b2ee3db9e52817cd7aa871539aaed