Merge "Rework some of the voice interaction APIs."