Merge "SensorService: Fix some warnings"