Merge changes Ie7c3cd59,Ieed87d17

* changes:
  Update the battery string based on new mock.
  Update the string in battery screen