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