Merge "Tune delivery and batching of alarms" into lmp-mr1-dev