Fix cpplint errors - part 1

Change-Id: Id975e0b9b7a3b8628bb5de62fed3f4f35bd08c48