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

* commit '09746d898099332a079af5349278e7c284fc2cbe':
  Fix sensor usage model