Merge "Captive portal detection uses 3rd fallback probe" into nyc-mr1-dev