am e49d97df: am b8bc0231: Merge "More precise control of batch alarm." into lmp-dev

* commit 'e49d97df5a81e3b66a8fd899500d84d8e44a5611':
  More precise control of batch alarm.