am 69d4c16b: am fc5a45fd: am 57ab4478: Merge "Make Test Voice Interactor support new requirements." into lmp-dev

* commit '69d4c16bd7fe2530f8fd35f04b87cb3034d8bafe':
  Make Test Voice Interactor support new requirements.