Merge "Make TYPE_VPN_LEGACY no longer deprecated."