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

Change-Id: If06761b413cda9d3f79aa79e8ae60cf0ce306946