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

Change-Id: I22c921fde0abb5993d1ddb3bb3660b07a72326d3