[automerger skipped] Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev am: e7300721a0  -s ours am: 171dd95a69  -s ours am: 1cc38b49e1  -s ours
am: 6599763840  -s ours

Change-Id: I0df849f248eb98477da4a5e15671f4427ecafdcf