Merge "Modify VTS to allow testing shim caching"