Remove some redundant consts Upstream-commit: 2c43762cf2a33d9782c1a87ebf2469fc138a5c6b Component: engine