Merge "Handle data scheme for data SMS in VisualVoicemailServiceTest" into oc-dev