DO NOT MERGE Captive portal systel log improvements am: b32417a772  -s ours am: 6352f85398  -s ours am: 9b07cb2fc1
am: 486221fbcd  -s ours

Change-Id: Iec0a3049392c38f1cc8ebce0983ea68cfc455cbc