am d6d72e5b: Merge "Fix battery controller non-fire bug" into lmp-preview-dev

* commit 'd6d72e5bc4e5659eb06606abce01da80e6d2f2b6':
  Fix battery controller non-fire bug