Merge "Fix build warnings for CaptivePortalLogin"