Lint cleanup from William Rucklidge.

Change-Id: If545f114c1a2b07edd660a3c71ecfc16ffa25e43
3 files changed