b222933af6
Following the work done at https://dart-review.googlesource.com/c/sdk/+/276941. But trying to merge this time. Fixes: https://github.com/dart-lang/sdk/issues/49818 Fixes: https://github.com/dart-lang/sdk/issues/53599 Change-Id: I7ed6890ec3d526b855dd71b45e0493cbaf419d6d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/410862 Reviewed-by: Samuel Rawlins <srawlins@google.com> Auto-Submit: Felipe Morschel <git@fmorschel.dev> Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Samuel Rawlins <srawlins@google.com>