Lint fixes from William Rucklidge.

Change-Id: I57a6383bb875b24083cd9b7049333292d26f718c
3 files changed