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

Change-Id: Ifc9d98444bffb923ecbda3d125f50e5a1adf396d