DO NOT MERGE Captive portal systel log improvements am: a4f17bcbdf
am: 3dc894e7fe  -s ours

Change-Id: Id6c15e6ed64f460f7f08c7358c751c1ab6dc8d2e