Merge "Set legacy type for VPN"