Merge "Update string for not charging." into oc-mr1-dev