Merge "Remove Combination alarms support"