Fix cpplint errors - part 1

Change-Id: I655a2f10c0b842f5a63cbcc207c7f7164472dde8