Thanks @mradcliffe for the suggestions. I have updated the patch with the cha...

Thanks @mradcliffe for the suggestions. I have updated the patch with the changes. For #1, my bad, I didn't see that $this->entityTypeManager->getStorage('file')->load($csv_file_id) was there in the if condition too. For #2, I removed final from the class. I made the changes as per your suggestions.