am 06b55cae: Merge "Refactor sensor operations."

* commit '06b55cae537a60cca52dbcb7aa10997e06a70cee':
  Refactor sensor operations.