update for Dart r21021
updated for Dart r21658