Dart 23552

Closes #20267.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>