Fix some lint warnings

Change-Id: I53802c79ef30ae43d27fb1939d4470f3d7c0af3d