Merge change 21025 into donut

* changes:
  The DONUT constant also needs to be updated to the official SDK version.