Fix cpplint errors - part 1

Change-Id: I77b554441ce5837cf365f64eff15567d35f5b1be