Merge "Clear CDM associations onPackageDataCleared"