image fix lint errors/warnings Upstream-commit: ae5c8e3b69fbde82390f8665c0110896a90e14bc Component: engine