Merge "Handle ISODEP & EmptyAID route entries to SE which doesn't support tech A/B"