Merge "Enhance SetAlarm API" into ics-ub-clock-amazon