Fix cpplint errors - part 1

Change-Id: Id1d70b00fd58eae6f3efdd088bb5cd11b1913746