Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am: 8a95d49d8f am: 54c10dca58
am: 8323830495

Change-Id: Ie4fe65681b0fa537288923154f84794dfa779dfc