Lint fixes

Change-Id: I7f2a98a09833da4729db6bad0710a9db72e7fbb9