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

* commit '47b2ecddee3a3dedfd1781b6fc44666acce64927':

Change-Id: I43b83550342543014486446ced6adb12d26b72e0