Revert "Cherrypick sensor updates"

This reverts commit 7176aebff6c77cefa280e289fdb405eab9bad75d.