Fix new lint errors

We'll get to lint parity soon and then not need to do this.
Merge pull request #2677 from zpao/lint-internal

Fix new lint errors