fix flaky test TestImportFileWithMessage Upstream-commit: 0b5e84cc8d190520e55a80530d29c455805974af Component: engine