Fix cpplint errors - part 1

Change-Id: I749d380e9b6713e722ca79ed9940c36aeb13f2d6