Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev
am: a77bc91b55  -s ours

Change-Id: Ib184bce22c6d4e94983f5a2ad9ddc21cd1c5392a