Merge "Remove duplicate alarm tones"