Merge "Remove 'until next alarm'." into nyc-mr2-dev am: fd5f6e9446
am: a167322e66

Change-Id: Ia591935f33c21a9578c201da5f342f798afa73da