Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev