Merge "Battery monitoring fixes:"
tree: 13107af05a9873cc3d4ef92592183c92e2a0ab9d
  1. core/
  2. services/
  3. tests/