Merge "CaptivePortalLogin ignores some ssl errors."
am: d56856876f  -s ours

Change-Id: I6e4b778a7ea4ca9425834ed37c7f2b59cf458186