DO NOT MERGE Captive portals: login activity probes like NetworkMonitor am: 2c02197bdd  -s ours
am: 2a913049ab  -s ours

Change-Id: Icf09b29bfe619ee56d4e9ae0d640ed00fbb4ef31