Merge "Correct labels on files / props in vendor_dlkm."