Merge "Add strings for battery level info of connected devices" into oc-dr1-dev