Merge "Fixing the race condition in GenerateRkpKey"