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