am 1895ea38: Fix cpplint readability/fn_size issues

* commit '1895ea386ca78573302483f589ebabd8ce1480e7':
  Fix cpplint readability/fn_size issues