Add generics to the field types in the API file.
automerge: 1e62346

* commit '1e62346e7cb16254b31877f30741cd30637b043f':
  Add generics to the field types in the API file.