Merge "Re-factor state machine in NetworkMonitor"
am: 2339da24d8

Change-Id: I6d3ca73a09cdb145160729fee57ceca88493812c