am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-dev

* commit 'd6f7d9b75931d031086a744cfd18994b2673f311':
  Clean up voice API.