Additional Changes for Voicemail

Change-Id: I685d553717db9ba86b7b00be1bcfdc851450e542