Add VoicePlus

Change-Id: Iec8a49937332595d73057593d8af83a14d5b3b93
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1