Merge "Revert "Fixing the race condition in GenerateRkpKey""