DO NOT MERGE Logging improvements in CaptivePortalLoginActivity am: a61684feb4
am: bfaccfc360  -s ours

Change-Id: I2ec804fa3148971cccb2a0f1b34be6f1d05ef56e