Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev