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

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