Merge "Update charging string" into tm-qpr-dev