Merge "VPN: give legacy VPN a fake package name."