Fix lint errors

Test Plan: make test-full

Reviewers: cramer

Reviewed By: cramer

Differential Revision: https://tails.corp.dropbox.com/D61969