Merge "Update some battery string comments" into oc-dev