Merge "Add associated device property to AssociationInfo"