Fix cpplint errors - part 1

Change-Id: Ia79fc101d47439dade6802023eb98d89915cfd22