Merge "Add cts for new VpnProfile fields"