Merge "Jelly Bean ringtone Bug: 6619980" into jb-dev