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

Change-Id: I40b069c811b9cc687265f802524b8b290cd4f269