Remove circular dependency between entity and api schema#1990

gfakbar20 wants to merge 3 commits intoapache:mainapache/polaris:mainfrom

gfakbar20:remove-circular-dependency-entity-and-api-schemagfakbar20/polaris:remove-circular-dependency-entity-and-api-schemaCopy head branch name to clipboard