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

Change-Id: I9d83aeb57d05baea53d1afb086ae582d18701265