Merge "Update the battery string." into pi-dev