Fix cpplint errors - part 1

Change-Id: Ib5d0bcd7caba51179b1c0f232554f526ffb5ee5a