Merge "Revert "Add a second thread for sensor service.""