Sync Voiceplus

Change-Id: I7767a2907acc0465d4a55cfe18905865c6b133d9
Merge "Sync Voiceplus" into kk44