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

Change-Id: Ifc5d31d42df58c13185c7c9ec05ab69f36236f19