am faf3f370: Merge "Fix sensor usage model" into cw-e-dev

* commit 'faf3f3706140c3b90c805e77c3c72c0978b0d61a':
  Fix sensor usage model