Fix some lint warnings

Change-Id: I57a24f602a1ae55efc2ed03f1785c50522339de9