Merge commit 'f288e90'

This commit was used in the Dart SDK DEPS and must be reachable from
master.