Fix cpplint errors - part 1

Change-Id: Ic6761d74e3c0d2277bec30c6ad471ca03518f29a