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

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