Merge "Avoid double lookup in cdm association store"