Merge "Cleanup VoicemailContract."