Fix cpplint errors - part 1

Change-Id: I19e21ae436f8e70dbee3036541f79992b7e0bafc