Merge "Captive portal: rotate fallback urls" into oc-dev am: a622b24d3a  -s ours
am: af18992066  -s ours

Change-Id: I86641338b2551a9b0136704dcfeed6327c639407