Fix cpplint errors - part 1

Change-Id: I4f66c25481e6ae471a72095ed77e06d4910d0703