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

* commit '90ae27788d261b331fde781fe06b4309d922d35c':
  Fix issues with new TTS API