Merge "CaptivePortalLogin ignores some ssl errors." am: d5685687 -s ours am: ae62bb1d am: 6393105a am: f6f80904 Change-Id: I1e3f872cf2d8d3550ccfecdd6a81be1bd8f4e530