Merge "Fix checking if association's MAC address changed in AssociationStoreImpl"