Merge "Rename CDM's Association class AssociationInfo"