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

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