Fixes https://github.com/dart-lang/sdk/issues/23924 BUG= R=asiva@google.com Review URL: https://codereview.chromium.org/2542003002 .