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

* commit '5eccf896a838c74f844af5dc3e4e3584d3aff708':
  Fix sensor usage model