Merge "CaptivePortalLoginActivity: improve logging" am: c0a4f5357e am: d5174ac63d
am: d394285fdc

Change-Id: I68cced9b81569a6338d0e55062691d87288e8aff