Add generics to the field types in the API file. automerge: 5db09cd automerge: 5787d1d
automerge: f8a3be5

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