Merge "Update battery states text to support battery feature(1/2)" into sc-dev