Merge "Fix sensorservice on integer sanitized builds."