Fix lint errors merged while new lint branch was in PR Upstream-commit: 0c6b8d717d Component: cli
0c6b8d717d