Style fixes for fmt + err usage. Upstream-commit: 8a8109648a7b99acf6aff9336a39150f2c6e05a4 Component: engine