Merge change 6255 into donut

* changes:
  Fix the comments for the string resources for the charge status.