Merge "Make changes to the TTS api suggested by the API review."