Merge "Fix a CDM crash during association"