Merge "Remove 'until next alarm'." into nyc-mr2-dev