Merge "Fix memory leak in upgrade_crypt_ftr"