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

Change-Id: Iad64dbd0b57028e2a5567c81bb86152cdb6d17a4