Fix lint
Merge pull request #2710 from zpao/lint-fix-again

Fix lint