am 57f2cba2: Merge change 6255 into donut

Merge commit '57f2cba2db4b5565b0f70bd5501e8d964dce3ad4'

* commit '57f2cba2db4b5565b0f70bd5501e8d964dce3ad4':
  Fix the comments for the string resources for the charge status.