Fix cpplint errors - part 1

Change-Id: I18563ef8d3189d5ef36737c2de6ddfcf683e86e9