Merge "Change packVaultParams to use the real vault_handle directly"