Merge "fix cellular captive portal reevaluation url" am: 88307143e0
am: c0aea2f563

Change-Id: I1330ba47aaed7d3df0df80b3efc354b63cd9bdda