Merge "Fix CaptivePortalDataTest on R"