Merge "framework/base changes to add new voicemail provider sample."