3dc201e168
Combination of Brian's change: https://dart-review.googlesource.com/c/sdk/+/63901 and Devon's change: https://dart-review.googlesource.com/c/sdk/+/66405 Change-Id: I57e5d1f7d3a653f225aba2d690190fe1ff18a5b1 Reviewed-on: https://dart-review.googlesource.com/67344 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Danny Tuppeny <dantup@google.com>