Merge "sensorservice: remove out of date FIXME message"