Lint changes from William Rucklidge

Change-Id: I351bef3bf7969a60d8d715731a9eafab5d612a81
2 files changed