am cb4c0af3: am 46814fbf: Merge "Override Body Sensors string for watches" into cw-e-dev

* commit 'cb4c0af3423a8e5ab9caf900d7fd3ca3e362980a':
  Override Body Sensors string for watches