6c6144bb74
Closes #40414 and #40156 Change-Id: I066aa8ceef4f998230215fd9e9b446b2281cc3bc Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/138294 Commit-Queue: Johnni Winther <johnniwinther@google.com> Reviewed-by: Dmitry Stefantsov <dmitryas@google.com>