Merge "Back PlatformKeyManager with database"