am 41db81da: am f9901b2d: Merge "Remove redundant parameters from fullFieldsCalc"

* commit '41db81dac45e2ab14dcda7edb2b648fbe8365c64':
  Remove redundant parameters from fullFieldsCalc