Merge "Fix broken testCaptivePortalApp"