Merge "Logging improvements in CaptivePortalLoginActivity"