Merge "Fix a crasher in SensorService"