Merge "Make clean_scratch_files work"