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

* commit 'a42d95f1bc89dbbb4d34c62dac20ba3d9541603a':
  Tune delivery and batching of alarms