Fix cpplint errors - part 1

Change-Id: I9047cbf9db5b1529e535a0cc38b2f3f3ec729055