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

Change-Id: I790efb24b0b50271bb4af6a5b0919582e1200377