Lint cleanup

Change-Id: If31cae6b051cdd8559aed5b71fb15e2dcc6f322e