readd VoicePlus

Change-Id: I3a07542ff8d377044058651c0244052f43708141
Merge branch 'cm/cm-11.0'