Merge commit '116e8ef1f88ce1ead23777826dec5bd98bf99708' * commit '116e8ef1f88ce1ead23777826dec5bd98bf99708': TextToSpeech class cleanups
Merge commit '116e8ef1f88ce1ead23777826dec5bd98bf99708' * commit '116e8ef1f88ce1ead23777826dec5bd98bf99708': TextToSpeech class cleanups