Merge "Fix sensor usage model" into cw-e-dev