Fix cpplint errors - part 1

Change-Id: Icfde23fc42acfa5b89be7341efb52aca941d8470