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

Change-Id: I2d59709712d96b78e1bd5d634e6c31cc0a0d6ff0