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

Change-Id: I2b874710bada51620eb55d8357e39e68c7088a79