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

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