Merge "Fix compiler warnings in sensorservice." into nyc-dev