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

Change-Id: I9cfa68615af9415265955d62a924d8fb9ddb2d80