Merge "Update battery state string" into sc-dev