Merge pull request #16564 from calavera/versioned_types

Extract api types to version packages.