Lint and other fixes from William Rucklidge

Change-Id: Ic18561a5cdadccc75e97818fa4422bb5d9d43df9
8 files changed