am 9c61160f: Merge "Fix ringtone test" into jb-mr1.1-dev

* commit '9c61160f33b7bc4beaccf736f4472c1207c3d659':
  Fix ringtone test