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

Change-Id: I4c26b3bf4ae6179193768783781aa8fbe0ac92cc