Cherry-pick #3784 into an 8.0.9+1 release#3800

srawlins merged 6 commits intodart-lang:eight-oh-nine-onedart-lang/dartdoc:eight-oh-nine-onefrom

srawlins:eight-oh-nine-one-fixsrawlins/dartdoc:eight-oh-nine-one-fixCopy head branch name to clipboard