Merge "target_files_diff: Fix the issue with file type change."