Merge "Fixing the race condition in GenerateRkpKey" into sc-dev