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

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