more lint fixes

Change-Id: Ia61a2d53a00ae664d6d7ad8c01af7c57eb0a2339