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

Change-Id: I6f4c7a0c15373e56fc178f287f6a0eb54d0d4018