Merge "Minor cleanups to TextToSpeech."