Fix cpplint errors - part 1

Change-Id: I22c63a0946e6076d57f6371fab07afc08937470c