Merge "Use mAddressMap in cdm getAssociationsByAddress"