Merge "Add API for CaptivePortalData"