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

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