Closes #25596 BUG= https://github.com/dart-lang/sdk/issues/25596 R=kustermann@google.com Review URL: https://codereview.chromium.org/1651023003 .