Fix cpplint errors - part 1

Change-Id: I29711fc2a0c3d0a904ea951a015d1a2bc9f507b6