Fix cpplint errors - part 1

Change-Id: I0e95bccc659c30e18de0facdefce86350949d01e