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

Change-Id: Icf2ff95f201523d52a5089db80bc2bb4f7b28088