Fix cpplint errors - part 1

Change-Id: I103a1ffe8e762b5d0bb6c2be94b2ea9817f803cb