Fix cpplint errors - part 1

Change-Id: I84b16dc7d256b519c1a15719727bb0c98a45bc22