Several circular dependency fixes#32317

clydin wants to merge 2 commits intoangular:mainangular/angular-cli:mainfrom

clydin:circular-deps-1clydin/angular-cli:circular-deps-1Copy head branch name to clipboard