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

* commit '32190676f55713bce74571c123c7903004c9c383':
  Fix issues with new TTS API