Fix lint errors on master Upstream-commit: 9b4a616e4b3819ef062780b5fd854616be2c22bb Component: engine