Merge "Set legacy type for VPN" into sc-dev