Merge "Fix issues #16655104 and #16875776 in battery stats." into lmp-dev