Fix cpplint errors - part 1

Change-Id: Iac9a2164afed4f1a4ffefcf3ca2022a62d630ce7