Merge "KeyStorage: improve logging for key generation"