Fix cpplint errors - part 1

Change-Id: Ib20c378ed80206e1920ebc43bd6205477b985ae4