Merge commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c' * commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c': Small fixes to battery stats.
Merge commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c' * commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c': Small fixes to battery stats.