Lint analysis fixes

Change-Id: Id889abf59786ad27ade4e3ab2a221f72bbf7fc21