Dart 23552

Updated Dart 23552 from 23552