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

Change-Id: Ie831b10e45cee740f519896312ede84ebb69e6f2