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

* commit '137bfad24f26fb3526329aadfe02d751e87027b5':
  Jelly Bean ringtone Bug: 6619980