Fix up lint issues

Change-Id: I2ea5a5726c22d02903282b57ef59121bbbfdee13