Fix cpplint errors - part 1

Change-Id: I6a76480aafa42b53b24fa71e9910facf7ccf8783