am 4479ba35: Merge "Change FieldHelper to use a handle."

* commit '4479ba35389b03ccc9eabd17fba6168f9505517a':
  Change FieldHelper to use a handle.