am 3660c095: Merge change 7094 into donut

Merge commit '3660c09500a4d01eb6a733b5f0b15545855f8fe8'

* commit '3660c09500a4d01eb6a733b5f0b15545855f8fe8':
  Cleaning up TtsService