Lint analysis fixes

Change-Id: I1d5450b154e84d8848827f7e46ff7087f6cac362