Merge "Override Body Sensors string for watches" into cw-e-dev