Lint cleanup and a bug fix.

Thanks to William Rucklidge.

Change-Id: I963656be661020abacbff792cfc3025623503db8
4 files changed