Merge "Make Test Voice Interactor support new requirements." into lmp-dev