Lint analysis fixes

Change-Id: I1d5e9e0fbee657b87016baf7b9f8f5db3d21bf54