Merge "Use SHA_2_256 for importWrappedKey" am: 0ce3156f97 am: b2a847aea7
am: 0690156c0d

Change-Id: Ifa158f44c6cecb893ec783a87ef4a68db29ad51b