Merge "Fix KM VTS tests for Strongbox implementations"