Merge "Move delete support into FileOperationService."