Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5 am: 4479901ff3
am: 43cdbc943d

Change-Id: I4f3bd72a8cfa75853474039e7f6e44a5a89bf950