am f9901b2d: Merge "Remove redundant parameters from fullFieldsCalc"

* commit 'f9901b2d274fdc2aab890c1e51e09042605b1370':
  Remove redundant parameters from fullFieldsCalc