Lint changes from William and Jim.

Change-Id: Ida89b67c66b3bc7683d95e63646dfb2f9679d1b1
13 files changed