Fix an issue with service logs hanging Upstream-commit: 7ca86796c94c7ae0c62680ac664f97ab5f35ebec Component: engine