Merge "New alarm ringtones" into jb-mr1-dev