Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev