Merge change 3528 into donut

* changes:
  Simplify the TTS for Donut release