Fix cpplint errors - part 1

Change-Id: I097ac617721329b860a91648fb909d80743b18f0