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

Change-Id: Iad81be953573a43e7ff5cffb06af5222f4e67322