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

* commit '46814fbfc842d80033f4b1a8ae702f25eb8fd5d2':
  Override Body Sensors string for watches