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

Change-Id: I0b188a23c337639d0e83b5d1042e4bc561921e52