Merge "Update sensorservice owners" into main