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

Change-Id: Ic14ee561b8ba75f85fc859efdcca0410d404b4c2