Dart 22416

Closes #19644.

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