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

Change-Id: Ie6d97db160bb0155ba6bf20d620f7946fe980cd4