Merge "Handle SSL errors in CaptivePortalLoginActivity" am: c6c06b004e
am: 95a00c4496

Change-Id: Iff43645aaabd481d778a07978e4eb04c6c50d53c