Merge "Add PlatformEncryptionKey (again)"