Merge "Add new Credential prefix for platform VPNs"