a3f591f199
Fixes at least some of the issues in https://github.com/dart-lang/sdk/issues/47851. Change-Id: Id92a1aa82b55d9fda244e7fd279028db392777d8 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/222303 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>