Pick from mainline - Make sure we dont return TOR as interface subtype if we are not on TSN.