Merge "Add additional parameters to importWrappedKey"