Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev
am: 037503dfa0

Change-Id: I008839786c3557f3dd418f8bb82f1cea0c27d3a1