Fix cpplint errors - part 1

Change-Id: I1040353c010e0168c9b6a0cc6a09ad6416c265cb