am e22b21af: am ebc83b3e: Merge "Fix memory leak in upgrade_crypt_ftr"

* commit 'e22b21af3a4d7729c23f559add26bc4f78cbaab1':
  Fix memory leak in upgrade_crypt_ftr