Lint fixes

Change-Id: Ia5eba1c586787d524adbc126842aef66b148d796