am deca2a04: (-s ours) Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev

* commit 'deca2a041d13846158b0db92781b352ab473d9bc':
  (DO NOT MERGE) Battery monitoring fixes:
tree: 13107af05a9873cc3d4ef92592183c92e2a0ab9d
  1. core/
  2. services/
  3. tests/