am 453dd50e: Merge change 6307 into donut

Merge commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a'

* commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a':
  Fixes a compatibility issue with users that have the old TTS