Fixes to support multiple alarm instances
am: 821d4a64ba

* commit '821d4a64ba5e402e164b380c89db3ce4cacd045e':
  Fixes to support multiple alarm instances