Merge "Adds support for multiple off-host AID routes"