am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev

* commit 'b88ba912f6bb2fd0ae16794470cce38ee308b6ea':
  Fix alarm delivery-order sorting