Merge "Fix KM VTS tests for Strongbox implementations" into pie-vts-dev