Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev