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

Change-Id: I38134417bc4413a620b76dba12691a9303da1167