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

Change-Id: Ib4418fa8e1bf1660b622b9015a08a3ea375d2d07