Merge "Add always-on VPN support for platform VPNs"