Merge "Add lower case charging string." into oc-dev