Merge "Add freeCache API to ExternalStorageService"