Fix cpplint errors - part 1

Change-Id: I410af9ed886ce69fb31b8e1f3d409101c0ff2e2d