Merge "Copied over latest changes to VoicemailContract api."