am 6cdc4f9c: Merge change 6880 into donut

Merge commit '6cdc4f9c00eafcecec74dbd7f74202508830fdd3'

* commit '6cdc4f9c00eafcecec74dbd7f74202508830fdd3':
  Fixing TTS breakage.