DO NOT MERGE Captive portal systel log improvements
am: b32417a772  -s ours

Change-Id: Ibce1d4e604e5fd8c67c012cd7f264e4585117b24