correct some nits in comments and test Upstream-commit: 2a87856599139ae4e7bfe30a8a4f09f64e06f6be Component: engine