Lint fixes from Jim Roseborough.

Change-Id: If93e1972041b36410225a509e3c8c7c818f92124
3 files changed