Fix cpplint errors - part 1

Change-Id: I883c83087599564619eaafddb04f06fc4eb17092