Fix cpplint errors - part 1

Change-Id: I8731f578c01f39894b2faa5137c537a920c8bd49