Remove 'until next alarm'. am: 5edde5f18a
am: 177a976a69

Change-Id: Ibc7fa4b34ea4822e61c78477007cef862dfe0127