DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am: 7f086e162b  -s ours
am: 7520a07036  -s ours

Change-Id: If035aa5fb1783bfc180c928969f08d89b5dd19f0