Merge "Fix ringtone test" into jb-mr1.1-dev