Merge "Set correct SID when generating a platform key"