am 354ee927: am 33ecc6e0: am b5c55da5: am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev

* commit '354ee927db8edb36ec7a726069e137f0edd61f7f':
  Fix alarm delivery-order sorting