Merge "Require VDM device profile for CDM associations" into main