Merge "Include cache files from sdk data when cleaning using freeCache"