am 02e57214: Merge open-source donut back into internal tree

Merge commit '02e572140aed422ffa73e8d1c69ee22dd5f2bf80'

* commit '02e572140aed422ffa73e8d1c69ee22dd5f2bf80':