Merge "Fix issue where self-managed calls play ringtone. " into oc-dev