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

Change-Id: I7981b678c7043b0680339178f5e3a86d456b60f2