Merge "Add RINGTONE" into oc-mr1-dev