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

Change-Id: Iea6582b4c7f347c24ebccf815256dd7125ab29de