Stubbed out createAlarm() and recreateAlarm() methods
Merge remote-tracking branch 'origin/master'