Merge "Ensure key generation retries after remote key provisioning"