ESE-and-UICC-AID-getting-routed-to-HOST
diff --git a/src/nfa/ee/nfa_ee_act.c b/src/nfa/ee/nfa_ee_act.c
index c2e5fe1..cc730a1 100644
--- a/src/nfa/ee/nfa_ee_act.c
+++ b/src/nfa/ee/nfa_ee_act.c
@@ -3281,7 +3281,7 @@
                     }
                     *pp++ = NFC_ROUTE_TAG_AID | route_blacklist_mask | route_qual;
                     *pp++ = len + 2;
-                    *pp++ = p_cb->nfcee_id;
+                    *pp++ = p_cb->aid_rt_loc[xx];
                     *pp++ = p_cb->aid_pwr_cfg[xx];
                     /* copy the AID */
                     memcpy(pp, pa, len);
@@ -3330,7 +3330,7 @@
                     len = *pa++; /* aid_len */
                     *pp++ = NFC_ROUTE_TAG_APDU;
                     *pp++ = len + 2;
-                    *pp++ = p_cb->nfcee_id;
+                    *pp++ = (p_cb->apdu_rt_info[xx] >> NFA_EE_APDU_ROUTE_MASK);
                     *pp++ = p_cb->aid_pwr_cfg[xx];
                     /* copy the AID */
                     memcpy(pp, pa, len);
diff --git a/src/nfa/int/nfa_ee_int.h b/src/nfa/int/nfa_ee_int.h
index 6bbf22c..48f6523 100644
--- a/src/nfa/int/nfa_ee_int.h
+++ b/src/nfa/int/nfa_ee_int.h
@@ -192,6 +192,7 @@
 #define NFA_EE_MAX_AID_CFG_LEN (510)
 #endif
 #define NFA_EE_TOTAL_APDU_PATTERN_SIZE 250
+#define NFA_EE_APDU_ROUTE_MASK 8 /* APDU route location mask*/
 /* NFA EE control block flags:
  * use to indicate an API function has changed the configuration of the
  * associated NFCEE