lint fixes to mollify rake

Change-Id: Ic25a9b4ad7f80a2d7148706e0d806adcbed8f8cf