Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev