Fix cpplint errors - part 1

Change-Id: I163ccd9d434b8ac9be39f7608a3c1f2af83aece3