Fix a few lint bugs reported by early access users

Change-Id: I3f7d64737bdb1205dd147c9e071d56d33fb072c5
11 files changed