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

Change-Id: Iecbda3d98a7a52b5a20a5ebbf956f6f251d5f445