Merge "Got rid of deprecated fields from VoicemailContract api."