am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev

* commit '8ec2dc00e5225256976ee6f07a715932f65c8833':
  Tune delivery and batching of alarms