Merge "Fix the issue of voice interactor getting reset after reboot." into oc-dev
am: c59a2a7649

Change-Id: I5676e0f3927f2de123e9d5d219bd10a881754583