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

Change-Id: Ic91cca4e7babe179d13a82f850b634c98d55ff8c