Make cpu validation correct Upstream-commit: 86a6acf0715020412fe322e040749a9cea6c2c7a Component: engine