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

Change-Id: Ifa880c915ae1226d44fcf92e092147be0f677eb9