Merge "Add more tests for CaptivePortalData" into rvc-dev