unify voice search code

Change-Id: Icf1fc84405d08da8504ac91094e67c7d8d1c901d
4 files changed