Merge "timer cleanup" into ics-ub-clock-amazon