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

Change-Id: I7dbb77c9bd42d598dd3c14ad1e2ecd968a6f8062