DO NOT MERGE Captive portal systel log improvements
am: a4f17bcbdf

Change-Id: Icbba206e8c035f566ff6d9e500d972a3dcf65bb6