Merge "Fix for wrong ringtone when using VoWiFi" into nyc-mr1-dev