Lint cleanup from William Rucklidge

Change-Id: Id8b99a2f557efe3744e95a3947f26cdc0c9c269e
4 files changed