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

* commit 'd217ba02fe90d1b41ed3968b101f7b9614c69ed9':
  Change FieldHelper to use a handle.