Merge pull request #755 from dart-lang/wa-31963

Prepare for fix of https://github.com/dart-lang/sdk/issues/31963