Merge "Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev am: e40bb555d8 am: 0522f09bac  -s ours"