* commit '11827b1ae6048a88b22300d456d52b4bcfab879d': Fix issues #16655104 and #16875776 in battery stats.