Fix linter issues

Fix linter issues from commit 6c2e582a76d116cfbbf108abb0e2bd03284cb445

Bug: 177678050
Bug: 152746105
Bug: 173201396
Test: treehugger only
Change-Id: I230aa6b10dc1d603c6deb170067686d665c363d0
3 files changed