Error formatting cleanups Upstream-commit: 88f437d6c619f7b07a22cb5750814bce4d8d7164 Component: engine