Fix cpplint errors - part 1

Change-Id: I78cff5161628b25c6d1075fdd53c829b5c19c937