Moar lint rulez!

Bug: 37534642, 116675691, 116798271, 72059458, 111790177
Test: manual
Change-Id: Ib079ae580a827f225be08f90dbdddeee7d341c48
(cherry picked from commit daac37f229f84ed844adcf1ffd3432b235524d9b)
1 file changed