Fix cpplint errors - part 1

Change-Id: Ib2f0e7b1104ee6bc3f5a70751ea5247178d8b6eb