Merge "Add a second thread for sensor service."