Merge "Add RINGTONE" into oc-mr1-dev am: 7910dc9a4a
am: 81b3e02689

Change-Id: Ia06659ae20759618ff7274c7a2d3ce0978ddd706