Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev