Merge "cts: Wait for VFS cache to expire"