Merge "Update string for not charging." into oc-mr1-dev am: ed0c5cf48f
am: 205afa7bd6

Change-Id: I5b669558511845402fbda458c748dce1c931733f