am fcae4f83: Merge change 3862 into donut

Merge commit 'fcae4f838d75fd3352198ac1c881cc1c97f51aab'

* commit 'fcae4f838d75fd3352198ac1c881cc1c97f51aab':
  Adding TtsService and PicoTts so they get included.