Merge "Modify VTS to allow testing shim caching" into sc-dev