Merge "Refactor sensor operations."