Merge "Properly set default voice interactor" into nyc-dev
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: Ifcad5647ee8ab09765fe89f40693eb335996982a