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

Change-Id: I1743f0317fb1d535c1bad5593a45463c5488b79d