Fix cpplint errors - part 1

Change-Id: I822b08701681e957ee87c1a6d99de2a14c227c16