am b1eba213: Fix cpplint whitespace/comma issues

* commit 'b1eba213afaf7fa6445de863ddc9680ab99762ea':
  Fix cpplint whitespace/comma issues