Follow-up from "Make BulkImportWorker and BulkImport::EntityWorker retriable"

The following discussion from !135946 (merged) should be addressed: