Merge "Replace an outdated TODO in Keystore::exportKey"