Merge "Adjust captive portal test for setup wizard"