Merge "Use String in CaptivePortalData underlying types"