Merge "[CDM] Resolve callback for adding role holder for an association even if device profile is null." into main