Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106
am: 4d47eba86a

Change-Id: Ic2e927bec210f65a0de6face224ce0b8d227b0bc