Merge "Change wrapped key import to use SHA256"
am: 0a690992c3

Change-Id: I97c4a3f657140fd0f2c596cdeae057552258c51a