am 949ea9f0: am 32190676: am 90ae2778: am 299bb1fb: Fix issues with new TTS API

* commit '949ea9f011ee3577a6a73c6181185bd01f041597':
  Fix issues with new TTS API