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

* commit '24c192b87ff7b90ce4bc7568561a230c587a4fdf':
  Fix alarm delivery-order sorting