Lint cleanup from William Rucklidge

Change-Id: Iacbf77246109f687708696eee7fb6144d23e7ec5
4 files changed