Merge "Include cache files from sdk data when cleaning using freeCache" into tm-dev