Merge "Change wrapped key import to use SHA256"