Merge change 7094 into donut

* changes:
  Cleaning up TtsService