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

Change-Id: Ia549cba9d6041f1a1343b68345a0cb1c4f6a5feb