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

Change-Id: I92eceaf2295c7209166444248f0b1a719bef5f21