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

Change-Id: Ib1530bbebdbfbeeb82900e2f1dc7bc08498da6ba