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

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