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

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