Merge "Add new Credential prefix for platform VPNs"
am: 0ce0c59535

Change-Id: Icfe76e3ca3ba2f8245966f7eebe100fd9b77dcc8