am 59ef9b0d: am cb4c0af3: am 46814fbf: Merge "Override Body Sensors string for watches" into cw-e-dev * commit '59ef9b0d': Override Body Sensors string for watches