[DO NOT MERGE ANYWHERE] Fix bodysensor permission am: 1f24f0f597  -s ours
am: 8d4f6a3fb2  -s ours

Change-Id: Ibb5d37380fbf787fef2b6e4ec1d52defc750331d