Fix cpplint errors - part 1

Change-Id: Ife930aca6edd5937f3c41a38f0e600a92dad60fa